Skip to content
Snippets Groups Projects
Commit 7d1cd4d9 authored by bbaer's avatar bbaer
Browse files

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

# Conflicts:
#	extension/qfq/qfq/database/DatabaseUpdateData.php
parents 05baaa54 b9553436
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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