Merge branch 'patch-2' into 'develop'
ARGLE GARBLE See merge request pleroma/pleroma!776
This commit is contained in:
commit
040ab352a5
|
@ -25,6 +25,7 @@ erl_crash.dump
|
||||||
# secrets files as long as you replace their contents by environment
|
# secrets files as long as you replace their contents by environment
|
||||||
# variables.
|
# variables.
|
||||||
/config/*.secret.exs
|
/config/*.secret.exs
|
||||||
|
/config/generated_config.exs
|
||||||
|
|
||||||
# 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
|
||||||
|
|
Loading…
Reference in New Issue