Merged develop into master

This commit is contained in:
Dennis Thiessen
2020-10-03 18:19:12 +02:00
51 changed files with 646 additions and 556 deletions

4
.gitignore vendored
View File

@@ -1,7 +1,7 @@
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
/app/release/
.idea
.DS_Store
/build
/captures