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

Merge branch 'master' into '57-die-settingsseite-ubersetzen' 

Updates from Master



See merge request !73
parents 48a7ad7d 7837ffa6
No related branches found
No related tags found
2 merge requests!78Resolve "Die Settingsseite Übersetzen",!73Updates from Master
Hide whitespace changes
Inline Side-by-side
Showing
with 661 additions and 286 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