Merge branch 'py-moo/set-dns-lifetime' into 'master'

[irc/rizon/acid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f8dca81fc63f372b98dcdfa7d46c8d2e7ee6a598..7b2e3153dc4647355ffbb7360ed1ebb007be590d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ target
 *.pyd
 known_hosts
 .pydev*
+*.iml
+.idea