Merge develop into feature/770-add-emoji-tags
authorAlex S <alex.strizhakov@gmail.com>
Tue, 2 Apr 2019 12:16:29 +0000 (19:16 +0700)
committerAlex S <alex.strizhakov@gmail.com>
Tue, 2 Apr 2019 12:16:29 +0000 (19:16 +0700)
commit9e0567ec5237fc7a2ba37f5291962f3c58fd21f8
tree6caabbf049051d3725662eb765013ee9b844f0cc
parent484162c18774ff28842a517ae0afcaaf824e12bf
parentbd961a3badaf7aa7ffc97ab92a6b04367d1c514b
Merge develop into feature/770-add-emoji-tags
config/config.exs
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs