Merge branch 'mastodon-emoji-endpoint' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 7 Nov 2017 20:01:15 +0000 (20:01 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 7 Nov 2017 20:01:15 +0000 (20:01 +0000)
commitbe67db55475f2dc44590680242e116d3d0d4c1ec
treeb1158c7bd2df8dcfab9ffbe322cc5629f5be60cb
parentd761b1543af537fb6f1013c0930449c7c6a26941
parentc6210183e1d52b22133560eb31306919470e7a73
Merge branch 'mastodon-emoji-endpoint' into 'develop'

Add mastodon API endpoint for custom emoji.

See merge request pleroma/pleroma!8
lib/pleroma/formatter.ex
lib/pleroma/web/router.ex