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

Merge branch 'development' into 'master' 

Development

Wir haben eine funktionierende Live-Version, die wir als Grundlage für den Serverumzug verwenden werden.

See merge request !111
parents 5c60a1be d32f8fdd
No related branches found
No related tags found
2 merge requests!117Bugfix,!111Development
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 347 additions and 228 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