Merge branch 'develop' into issue/1218
authorMaksim Pechnikov <parallel588@gmail.com>
Wed, 25 Sep 2019 09:24:12 +0000 (12:24 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Wed, 25 Sep 2019 09:24:12 +0000 (12:24 +0300)
commit1a858134edabfe9a85e07fb801b9ed41649ba08a
tree9acff5da3ff7a09f5b6f1e33ee9ac225471b4da6
parent8c6cdff3cc48101711d0f09852866311780d97db
parent29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965
Merge branch 'develop' into issue/1218
lib/mix/tasks/pleroma/emoji.ex
lib/pleroma/emoji.ex
lib/pleroma/emoji/loader.ex
lib/pleroma/formatter.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/formatter_test.exs