Merge pull request #784 from yatskevich/master

arcresu · arcresu · commit f3503f42c63c · 2013-11-12T03:45:42.000-08:00
Add .idea_modules/ to Global/JetBrains.gitignore (from sbt-idea plugin)
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
@@ -18,3 +18,6 @@
 
 ## Additional for IntelliJ
 out/
+
+# generated by mpeltonen/sbt-idea plugin
+.idea_modules/
