Merge branch 'develop' into mutes-blocks-pagination
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 19 Oct 2020 11:40:03 +0000 (15:40 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 19 Oct 2020 11:40:03 +0000 (15:40 +0400)
commit76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f
treeffc5e72a54b1fe1289038e934fb20eb6c1431b4f
parent2b58b0dbce36042a8acbb41a8ddc8696d2e00d0e
parent0495a07dc77d81abf46cbe166ae3fec14f705809
Merge branch 'develop' into mutes-blocks-pagination
CHANGELOG.md
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs