Skip to content
Snippets Groups Projects
Commit 2c4c6e4f authored by Andreas Huber's avatar Andreas Huber
Browse files

Merge branch '#43' into develop 

# Conflicts:
#	models/common/authentification-info.json
parents 1b6edfde 4a2181be
No related branches found
No related tags found
No related merge requests 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