Merge branch 'dev' into feature/ios/xml

# Conflicts: # app/src/main/java/com/github/braillesystems/learnbraille/data/entities/BrailleDots.kt
braille-systems · Aug 1, 2021 · 1fc80de · 1fc80de
2 parents 0ef18d1 + 382490a
commit 1fc80de
Show file tree

Hide file tree

Showing 56 changed files with 4,144 additions and 4,146 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,10 @@
+# icons are binary
+*.png binary
+
+# code files and `gradlew` should always have LF line endings
+*.kt text
+*.xml text
+gradlew text
+
+# other files are treated as text by default
+* text=auto