Merge branch 'add-custom-emoji-test' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sun, 20 Jan 2019 10:58:19 +0000 (10:58 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 20 Jan 2019 10:58:19 +0000 (10:58 +0000)
commit501fba33d6bb02cca586cfeeac9fdcfec5c7436d
tree2b3771e6fe86a7ae899c65c960683aabe73100bf
parent2020f26040e8c3b76182c1a99e7ba310e2312eac
parentbe0fb5dec47e5dc69aaef5f9c4f6910eba92b48a
Merge branch 'add-custom-emoji-test' into 'develop'

Add a test to ensure #39 is fixed.

See merge request pleroma/pleroma!687