summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-09-19 07:35:34 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-09-19 07:35:34 +0300
commitd4ed3a35b8aa34cd968113970bbab445eb251703 (patch)
treedbbf93e12e33932d7774ab72fb54ff0ee08031d1 /.gitignore
parent2b40e57a72f3ee3209b204a5ae5e0221b1d66c7e (diff)
parentf95a2b2cda236f7c0e5ced2a4698e2b10d99fa53 (diff)
downloadpleroma-d4ed3a35b8aa34cd968113970bbab445eb251703.tar.gz
pleroma-d4ed3a35b8aa34cd968113970bbab445eb251703.zip
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9591f9976..3b0c7d361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,12 @@ erl_crash.dump
# Prevent committing docs files
/priv/static/doc/*
+docs/generated_config.md
# Code test coverage
/cover
/Elixir.*.coverdata
+
+.idea
+pleroma.iml
+