pleroma

commit: d4a54a90c9ae39947c71876d4d2988a05a02d7a1
parent c78e7d8b1159b5f36c4776d00f5e4b86a73d3ef5
Author: lambda <pleromagit@rogerbraun.net>
Date:   Tue, 24 Apr 2018 19:26:01 +0000

Merge branch 'gitignore' into 'develop'

Gitignore

See merge request pleroma/pleroma!131
Diffstat:
M
.gitignore
5
+++++

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 /*.ez
 /uploads
 /test/uploads
+/.elixir_ls
 
 # Prevent committing custom emojis
 /priv/static/emoji/custom/*
@@ -22,3 +23,6 @@ erl_crash.dump
 
 # Database setup file, some may forget to delete it
 /config/setup_db.psql
+
+.DS_Store
+.env
+\ No newline at end of file