Merge branch 'develop' into tests/mastodon_api_controller.ex
authorMaksim Pechnikov <parallel588@gmail.com>
Tue, 24 Sep 2019 05:06:04 +0000 (08:06 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Tue, 24 Sep 2019 05:06:04 +0000 (08:06 +0300)
commitd75d0ae134e0a8de9504507f4c78567b9eedcc72
treeb7be0da8e19018241cc22509863fefadabe8ff08
parent494bb6bac64361860db194aed57618450a76177d
parent29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965
Merge branch 'develop' into tests/mastodon_api_controller.ex
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs