summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-09-16 17:03:37 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-09-16 17:55:04 +0700
commit96816ceaa25c21cec7677e75dcddd7ffb42d83c3 (patch)
tree7d14925ffdc67390377efd5ece22304e71ced360 /.gitignore
parent4397a3fe4ac932a055901622b3c30a319997df6c (diff)
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4e71a7df0..3b0c7d361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,7 @@ docs/generated_config.md
# Code test coverage
/cover
/Elixir.*.coverdata
+
+.idea
+pleroma.iml
+