Merge and fix

2020-11-08 15:07:19 +03:00 · 2020-11-08 15:07:19 +03:00 · ce9f4add97
commit ce9f4add97
parent b91c85529d
548 changed files with 17517 additions and 16862 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,31 +1,31 @@
-# gradle
-
-.gradle/
-build/
-out/
-classes/
-
-# eclipse
-
-*.launch
-
-# idea
-
-.idea/
-*.iml
-*.ipr
-*.iws
-
-# vscode
-
-.settings/
-.vscode/
-bin/
-.classpath
-.project
-
-# fabric
-
-run/
-output/
-*.log
+# gradle
+
+.gradle/
+build/
+out/
+classes/
+
+# eclipse
+
+*.launch
+
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# vscode
+
+.settings/
+.vscode/
+bin/
+.classpath
+.project
+
+# fabric
+
+run/
+output/
+*.log