Merge remote-tracking branch 'upstream/master'

2017-11-22 00:54:56 -03:00
parent d20693e31b ea64def1ae
commit 19a9077274
652 changed files with 5538 additions and 280 deletions
@@ -0,0 +1,17 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
+
+.externalToolBuilders
+.settings
+.springBeans