Merge branch 'feature/issue79' into develop

bsorrentino · Feb 26, 2020 · 6aaa8db · 6aaa8db
2 parents abd261c + 3ec2718
commit 6aaa8db
Show file tree

Hide file tree

Showing 57 changed files with 1,259 additions and 689 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,23 @@
+# MacOS
+.DS_Store
+
+# Eclipse
 .classpath
 .project
 .settings/
+.factorypath
+
+# VSCode
 .vscode/
-*.sh
+
+# maven
 target/
-issue47.txt
-maven-compiler-plugin/
-.factorypath
+
+# intelliJ
 *.iml
-.idea/
+.idea/
+
+# Other
+*.sh
+issue47.txt
+.okhttpcache/