Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire...
authorlain <lain@soykaf.club>
Wed, 4 Nov 2020 15:51:42 +0000 (16:51 +0100)
committerlain <lain@soykaf.club>
Wed, 4 Nov 2020 15:51:42 +0000 (16:51 +0100)
commitdd2b3a8da92e0b823ac338657588339fbf2e9c86
treebc0cf8bb80ec91ec759484213f567880d5c26a17
parent8f5589cf667d8dd24da07e58db94225d81a55a7b
parent78cea44553c936813ffc2c4c47984a64255096ef
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
12 files changed:
CHANGELOG.md
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/common_api.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
test/pleroma/notification_test.exs
test/pleroma/user_test.exs
test/pleroma/web/common_api_test.exs
test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
test/pleroma/web/mastodon_api/views/account_view_test.exs