Merge pull request #116 from metamug/develop

Develop
metamug · Apr 21, 2020 · d20d00d · d20d00d
2 parents 806241a + e7e4c95
commit d20d00d
Show file tree

Hide file tree

Showing 80 changed files with 16,279 additions and 15,476 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+*.settings
+*.classpath
+*.project
 target/
 pom.xml.tag
 pom.xml.releaseBackup

diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml