Merge branch 'master' into dev

This commit is contained in:
2017-07-26 10:37:08 -04:00
3 changed files with 24 additions and 0 deletions

1
.gitignore vendored
View File

@@ -24,3 +24,4 @@ local.properties
crowdin.yaml
local
tmp/
secret/