Merge branch 'develop' into tests/mastodon_api_controller.ex
authorMaksim Pechnikov <parallel588@gmail.com>
Mon, 23 Sep 2019 18:41:57 +0000 (21:41 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Mon, 23 Sep 2019 18:41:57 +0000 (21:41 +0300)
commit179fa32dd5d7b4cf1b338fc3df4840ae33525606
treed674301d9d20e9da88bedff49d3d8a56646284d8
parentbc3e8c033bbef303890ff6afa92d1fe365e530fb
parentfd48bd80eb7eab563c25586b1deba2ed42c02c5a
Merge branch 'develop' into tests/mastodon_api_controller.ex
lib/pleroma/activity.ex
lib/pleroma/object.ex
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs