fixes after rebase
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Sun, 16 Aug 2020 17:28:31 +0000 (20:28 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Tue, 13 Oct 2020 13:44:02 +0000 (16:44 +0300)
commit1d0e130cb3f37f611ec8242d99c12f693e328112
tree9953114ab310b0609a4f4fa60d267f3b3cdfcaa1
parent7f82f18664f73a320f82d0430966b4f673391fbe
fixes after rebase
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
lib/pleroma/web/plugs/admin_secret_authentication_plug.ex