Skip to content
Snippets Groups Projects
Commit 86d9389b authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'develop' into 'develop'

# Conflicts:
#   interface/web/login/index.php
parents c1250ee2 27db86c9
No related branches found
No related tags found
No related merge requests found
Showing
with 98 additions and 303 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