aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAlban Gruin2017-10-03 09:28:49 +0200
committerAlban Gruin2017-10-03 09:28:49 +0200
commitae3358c1296a02352409910a9ffcc2307d5ea87a (patch)
treeb47df3b99f639acc24d751cc0a6a73937c10069b /.gitignore
parent9641fc9bb6ef2897c0d70e6d5d5ed3f8e295dbec (diff)
parent175fcd46f56d8c1c5d10a50b401c09c25cfcdf82 (diff)
Merge branch 'stable/0.10.z' into prod/pa1ch/0.y.zv0.10.0-pa1ch
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9377785..0975a47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
__pycache__/
migrations/
+.dir-locals.el
+TAGS