Skip to content
Snippets Groups Projects
Commit 3c82a17e authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'development' into 'carsten-development-patch-79301'

# Conflicts:
#   resources/lang/en/resultPage.php
parents f7131dea 3e0c371c
No related branches found
No related tags found
Loading
Showing
with 173 additions and 170 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment