Merge branch 'release/1.2'

SmartDataAnalytics · Feb 8, 2016 · fda45f9 · fda45f9
2 parents 1b980c4 + 32d5758
commit fda45f9
Show file tree

Hide file tree

Showing 742 changed files with 24,362 additions and 19,035 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@ target
 deptree.txt
 cache
 log
+*.idea
+*.iml