Merge branch 'develop' into master

KenjiOhtsuka · Dec 5, 2020 · ccae2ee · ccae2ee
2 parents 2305099 + a2d8b20
commit ccae2ee
Show file tree

Hide file tree

Showing 33 changed files with 495 additions and 221 deletions.
diff --git a/.gitignore b/.gitignore
@@ -81,4 +81,5 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties
 
 
-.DS_Store
+.DS_Store
+/core
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/harmonica.iml b/.idea/harmonica.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/modules/document/document_main.iml b/.idea/modules/document/document_main.iml
diff --git a/.idea/modules/document/document_test.iml b/.idea/modules/document/document_test.iml
diff --git a/.idea/modules/harmonica_main.iml b/.idea/modules/harmonica_main.iml