Merge develop to 770-add-emoji-tags
authorAlex S <alex.strizhakov@gmail.com>
Sat, 6 Apr 2019 13:34:00 +0000 (20:34 +0700)
committerAlex S <alex.strizhakov@gmail.com>
Sat, 6 Apr 2019 13:34:00 +0000 (20:34 +0700)
commit7410aee886fbb38615bb595b8b7be0722761a0a4
tree26372ac184398430a0a18f3285dba2b543632fb0
parentfa8483cb808ef4b8b907d7ec0eeb882f3f47d927
parent3c5daa0235aaf47eeeda557fd677e3604cb7d701
Merge develop to 770-add-emoji-tags

Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
config/config.exs
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs