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

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

diff --git a/.gitignore b/.gitignore
index 20914c5e547304014bf441915ed676b6d14dc882..7b2e3153dc4647355ffbb7360ed1ebb007be590d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 *.log.*
 *.yml
 !*.example.yml
+!trivia.yml
+!.gitlab-ci.yml
 *.ini
 !*.example.ini
 *.so
@@ -14,4 +16,6 @@ target
 .project
 *.pyd
 known_hosts
-.pydev*
\ No newline at end of file
+.pydev*
+*.iml
+.idea