aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api/common_api.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2017-11-07 20:01:15 +0000
committerlambda <pleromagit@rogerbraun.net>2017-11-07 20:01:15 +0000
commitbe67db55475f2dc44590680242e116d3d0d4c1ec (patch)
treeb1158c7bd2df8dcfab9ffbe322cc5629f5be60cb /lib/pleroma/web/common_api/common_api.ex
parentd761b1543af537fb6f1013c0930449c7c6a26941 (diff)
parentc6210183e1d52b22133560eb31306919470e7a73 (diff)
downloadpleroma-be67db55475f2dc44590680242e116d3d0d4c1ec.tar.gz
Merge branch 'mastodon-emoji-endpoint' into 'develop'
Add mastodon API endpoint for custom emoji. See merge request pleroma/pleroma!8
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
0 files changed, 0 insertions, 0 deletions