Merge remote-tracking branch 'origin/master'

# Conflicts: # build.gradle
TeamCovertDragon · Sep 13, 2019 · 4bd62fb · 4bd62fb
2 parents 23a9b33 + 1a78dbf
commit 4bd62fb
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ Thumbs.db
 gradlew
 gradlew.bat
 gradle.properties
+/.idea
 *.iml
 *.ipr
 *.iws