merge double upstream

2020-01-06 11:43:11 -05:00
parent b20c028566 264e04368b
commit 4d8f44ddae
900 changed files with 31103 additions and 22299 deletions
@@ -2,14 +2,21 @@
 /local.properties
 /.idea/workspace.xml
 .DS_Store
-/build
 .idea/
 *iml
 *.iml
-*/build
 /mainframer
 /.mainframer
+
+# Built files
+*/build
+/build
 *.apk
+app/**/output.json
+
+# Hebrew assets are copied on build
+app/src/main/res/values-iw/
+
 TODO.md
 CHANGELOG.md
 /captures