diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-19 14:30:13 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-19 14:30:13 +0000 |
| commit | 678fed47ee0b7e458d3324bea0c1171322d29b5f (patch) | |
| tree | 951f99bb59d3f6af1e33daad95f8bc40e2731b57 | |
| parent | 7b96a756fbcc6f814e70ad1b9ad6bd45844ea734 (diff) | |
| parent | 8696c25efd69046b29d7803ae3af2783aab473e1 (diff) | |
| download | pleroma-678fed47ee0b7e458d3324bea0c1171322d29b5f.tar.gz pleroma-678fed47ee0b7e458d3324bea0c1171322d29b5f.zip | |
Merge branch 'patch-2' into 'develop'
Ignore setup_db.psql and specify a folder for custom emojis
See merge request pleroma/pleroma!121
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 5211b4c93..2858cefd5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ /uploads /test/uploads +# Prevent committing custom emojis +/priv/static/emoji/custom/* + # Generated on crash by the VM erl_crash.dump @@ -16,3 +19,6 @@ erl_crash.dump # secrets files as long as you replace their contents by environment # variables. /config/*.secret.exs + +# Database setup file, some may forget to delete it +/config/setup_db.psql |