Merge branch 'patch-2' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 19 Apr 2018 14:30:13 +0000 (14:30 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 19 Apr 2018 14:30:13 +0000 (14:30 +0000)
commit678fed47ee0b7e458d3324bea0c1171322d29b5f
tree951f99bb59d3f6af1e33daad95f8bc40e2731b57
parent7b96a756fbcc6f814e70ad1b9ad6bd45844ea734
parent8696c25efd69046b29d7803ae3af2783aab473e1
Merge branch 'patch-2' into 'develop'

Ignore setup_db.psql and specify a folder for custom emojis

See merge request pleroma/pleroma!121