Skip to content
Snippets Groups Projects
Commit 79c68595 authored by Sandra Borst's avatar Sandra Borst
Browse files

Merge branch 'settingsScreenAnpassungen2' into 'develop'

x seconds warning mode, formatting of settings, if mascot visibility false,...

See merge request !26
parents c202edd2 3a175ffa
No related branches found
No related tags found
Loading
Showing
with 482 additions and 186 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