Merge branch 'stable'

michaelklishin · michaelklishin · commit 4a1178e2f7a1 · 2015-12-28T18:54:30.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -9,12 +9,12 @@
 *.ipr
 *.iws
 \#~
-/.idea/
-/build/
-/cover/
-/debug/
-/dist/
-/ebin/
-/out/
-/tmp/
+.idea/
+build/
+cover/
+debug/
+dist/
+ebin/
+out/
+tmp/
 junit*.properties

-Original file line number
+Diff line change
 *.ipr
 *.iws
 \#~
 -/.idea/
 -/build/
 -/cover/
 -/debug/
 -/dist/
 -/ebin/
 -/out/
 -/tmp/
 +.idea/
 +build/
 +cover/
 +debug/
 +dist/
 +ebin/
 +out/
 +tmp/
 junit*.properties