Merge branch 'develop' into tests/mastodon_api_controller.ex
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 26 Sep 2019 13:13:07 +0000 (16:13 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 26 Sep 2019 13:16:30 +0000 (16:16 +0300)
commit3d722dc2008ab7e5dde4b474bb038a1857a28d85
tree53c05aaea7626ec1f4782dd33eee779bb38d8730
parentd75d0ae134e0a8de9504507f4c78567b9eedcc72
parent6abe12dceda8d0d32878208987a9631d5d546a3d
Merge branch 'develop' into tests/mastodon_api_controller.ex
lib/pleroma/activity.ex
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs