Merge branch 'feature/770-add-emoji-tags' into 'develop'
authorlambda <lain@soykaf.club>
Mon, 8 Apr 2019 09:50:00 +0000 (09:50 +0000)
committerlambda <lain@soykaf.club>
Mon, 8 Apr 2019 09:50:00 +0000 (09:50 +0000)
commit23067908de957bb1e7ad2c87e64ae91e4328cb87
tree2c75327c2b35d5759eb971d5486a7f30bef8d386
parentb177e1e7f330ff1531be190949db7f75e378a449
parent7410aee886fbb38615bb595b8b7be0722761a0a4
Merge branch 'feature/770-add-emoji-tags' into 'develop'

Feature/770 add emoji tags

See merge request pleroma/pleroma!998
config/config.exs
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs