Skip to content
Snippets Groups Projects
Commit 45a51cf9 authored by bbaer's avatar bbaer
Browse files

Merge remote-tracking branch 'origin/master' into punktetool 

# Conflicts:
#	extension/Documentation/Manual.rst
#	extension/qfq/qfq/database/DatabaseUpdateData.php
parents 3c6b02a3 9bbd2a41
No related branches found
No related tags found
1 merge request!27Punktetool
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2809 additions and 217 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