Merge branch 'pr/n32_eljobe'

Conflicts: .gitignore
enlivenhq · Sep 23, 2016 · 2333495 · 2333495
2 parents 167bb49 + 70f4d33
commit 2333495
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 153 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,12 @@ teamcity-slack-integration-server/target
 
 # IntelliJ #
 .idea
+*.iml
+*.ipr
+*.iws
+
+# Emacs #
+*~
 
 # Gradle #
 .gradle

diff --git a/build/build.iml b/build/build.iml
diff --git a/teamcity-slack-integration-server/teamcity-slack-integration-server.iml b/teamcity-slack-integration-server/teamcity-slack-integration-server.iml
diff --git a/teamcity-slack-plugin.iml b/teamcity-slack-plugin.iml