Skip to content
Snippets Groups Projects
Commit 678fed47 authored by lain's avatar lain
Browse files

Merge branch 'patch-2' into 'develop'

Ignore setup_db.psql and specify a folder for custom emojis

See merge request !121
parents 7b96a756 8696c25e
No related branches found
No related tags found
No related merge requests found
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment