Merge branch 'patch-2' into 'develop'

ARGLE GARBLE

See merge request pleroma/pleroma!776
This commit is contained in:
lambda 2019-02-05 11:29:20 +00:00
commit 040ab352a5

1
.gitignore vendored
View file

@ -25,6 +25,7 @@ erl_crash.dump
# secrets files as long as you replace their contents by environment
# variables.
/config/*.secret.exs
/config/generated_config.exs
# Database setup file, some may forget to delete it
/config/setup_db.psql