diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-02-05 11:29:20 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-02-05 11:29:20 +0000 |
| commit | 040ab352a543bdaa7ac4c078db0fc24f0db37d5a (patch) | |
| tree | 344e6ee3861f94e586cf4d7d3ce89b98926baa8b | |
| parent | 8892f4468c474f169039977b62af1b524a413bf5 (diff) | |
| parent | 47eb557617ce1e74781a7d232fcfd92d2b32264a (diff) | |
| download | pleroma-040ab352a543bdaa7ac4c078db0fc24f0db37d5a.tar.gz pleroma-040ab352a543bdaa7ac4c078db0fc24f0db37d5a.zip | |
Merge branch 'patch-2' into 'develop'
ARGLE GARBLE
See merge request pleroma/pleroma!776
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 72fe2ce43..04c61ede7 100644 --- 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 |