Merging develop into feature/770-add-emoji-tags
authorAlex S <alex.strizhakov@gmail.com>
Tue, 2 Apr 2019 13:39:52 +0000 (20:39 +0700)
committerAlex S <alex.strizhakov@gmail.com>
Tue, 2 Apr 2019 13:39:52 +0000 (20:39 +0700)
commitfa8483cb808ef4b8b907d7ec0eeb882f3f47d927
treec710d397bb2c189026eee910ee910384abb8eab9
parentd140738edf75467420b35c500716cf89de66548d
parent180b87257cae481d4d9ffc9f03a06268ad8df569
Merging develop into feature/770-add-emoji-tags

Conflict test/web/twitter_api/util_controller_test.exs
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/web/twitter_api/util_controller_test.exs