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 pleroma/pleroma!121
parents 7b96a756 8696c25e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment