pleroma

commit: 040ab352a543bdaa7ac4c078db0fc24f0db37d5a
parent: 8892f4468c474f169039977b62af1b524a413bf5
Author: lambda <pleromagit@rogerbraun.net>
Date:   Tue,  5 Feb 2019 11:29:20 +0000

Merge branch 'patch-2' into 'develop'

ARGLE GARBLE

See merge request pleroma/pleroma!776
Diffstat:
M
.gitignore
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git 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