Merge branch 'gitignore' into 'develop'

Gitignore

See merge request pleroma/pleroma!131
This commit is contained in:
lambda 2018-04-24 19:26:01 +00:00
commit d4a54a90c9

4
.gitignore vendored
View File

@ -5,6 +5,7 @@
/*.ez /*.ez
/uploads /uploads
/test/uploads /test/uploads
/.elixir_ls
# Prevent committing custom emojis # Prevent committing custom emojis
/priv/static/emoji/custom/* /priv/static/emoji/custom/*
@ -22,3 +23,6 @@ erl_crash.dump
# Database setup file, some may forget to delete it # Database setup file, some may forget to delete it
/config/setup_db.psql /config/setup_db.psql
.DS_Store
.env