Merge remote-tracking branch 'origin/master'

Conflicts: .gitignore
owagner · Jun 11, 2015 · 3518601 · 3518601
2 parents 5682acd + 48d445c
commit 3518601
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-/eclipsebuild/
-/lib/
-/build/
-/bin/
-/hm2mqtt.devcache
+*.iml
+.idea/
+.gradle/
+build/
+hm2mqtt.devcache