[#468] Merged `upstream/develop`.
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 20 Feb 2019 13:48:59 +0000 (16:48 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 20 Feb 2019 13:48:59 +0000 (16:48 +0300)
commit6fe7acd58ecf2e12bc03499ba43351ff111d4385
tree918bb788674c83b8bdee086183a33090fcf91c22
parent3ad91ec3c165a1db853390c75f09c8618d08deae
parent11b3c10c54254ecad4b52f27856b8d95629e541c
[#468] Merged `upstream/develop`.
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex
test/web/mastodon_api/mastodon_api_controller_test.exs