From: lambda <pleromagit@rogerbraun.net>
Date: Thu, 19 Apr 2018 14:30:13 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=678fed47ee0b7e458d3324bea0c1171322d29b5f;p=akkoma

Merge branch 'patch-2' into 'develop'

Ignore setup_db.psql and specify a folder for custom emojis

See merge request pleroma/pleroma!121
---

678fed47ee0b7e458d3324bea0c1171322d29b5f