Merge branch 'develop'

thibseisel · Feb 17, 2021 · c337173 · c337173
2 parents 8831cbe + 22cd298
commit c337173
Show file tree

Hide file tree

Showing 435 changed files with 16,451 additions and 10,193 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/dictionaries/Thib.xml b/.idea/dictionaries/Thib.xml
diff --git a/app/.gitignore b/app/.gitignore
@@ -1,4 +1,4 @@
 /build
 /debug
-/beta
+/staging
 /release
diff --git a/app/build.gradle b/app/build.gradle