Merge branch 'patch-2' into 'develop'

ARGLE GARBLE See merge request pleroma/pleroma!776
6 years ago · 040ab352a5
parent 8892f4468c 47eb557617
commit 040ab352a5
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -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