Merge branch 'develop' into feature-139-confusion-matrix

DistrictDataLabs · Mar 20, 2017 · 4b900ef · 4b900ef
2 parents 23ac982 + abb0550
commit 4b900ef
Show file tree

Hide file tree

Showing 2 changed files with 248 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -121,3 +121,5 @@ fabric.properties
 # modules.xml
 # .idea/misc.xml
 # *.ipr
+
+.idea