Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
authorlain <lain@soykaf.club>
Sat, 24 Aug 2019 13:48:33 +0000 (15:48 +0200)
committerlain <lain@soykaf.club>
Sat, 24 Aug 2019 13:48:33 +0000 (15:48 +0200)
commitcc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a
treee80078875de15734e045f39e0bd9f82310961201
parent0e2b5a3e6aed7947909c2a1ff1618403546f1572
parentbc78a875c86db42d67122cfb767f239a55dacbea
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
13 files changed:
CHANGELOG.md
config/config.exs
config/test.exs
docs/api/differences_in_mastoapi_responses.md
docs/config.md
lib/pleroma/activity.ex
lib/pleroma/application.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/support/factory.ex
test/web/common_api/common_api_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/mastodon_api/status_view_test.exs