Skip to content
Snippets Groups Projects
Commit 54ee3075 authored by Carsten Rose's avatar Carsten Rose
Browse files

Merge branch 'master' into punktetool 

# Conflicts:
#	extension/qfq/qfq/database/DatabaseUpdateData.php
#	less/qfq-bs.css.less
parents 10ae096b b5d0a87d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1568 additions and 170 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment