moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'patch-2' into 'develop' 

Ignore setup_db.psql and specify a folder for custom emojis

See merge request pleroma/pleroma!121
This commit is contained in:
lambda 2018-04-19 14:30:13 +00:00
parent 7b96a756fb 8696c25efd
commit 678fed47ee
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -6,6 +6,9 @@
/uploads /uploads
/test/uploads /test/uploads
# Prevent committing custom emojis
/priv/static/emoji/custom/*
# Generated on crash by the VM # Generated on crash by the VM
erl_crash.dump erl_crash.dump
@ -16,3 +19,6 @@ 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
# Database setup file, some may forget to delete it
/config/setup_db.psql