Merge branch 'global-status-expiration' into 'develop'
authorlain <lain@soykaf.club>
Fri, 12 Jun 2020 14:14:09 +0000 (14:14 +0000)
committerlain <lain@soykaf.club>
Fri, 12 Jun 2020 14:14:09 +0000 (14:14 +0000)
commite557265a037caa0fd4ab35c811d19ad07a5f53fa
tree346a974d5256defa38df4f5853addafd8d756650
parent6d902916dd513fa2d60e37488a60fa8b152c73fa
parent4655407451c8dd05b6024f607e598359047efce2
Merge branch 'global-status-expiration' into 'develop'

Global status expiration

See merge request pleroma/pleroma!2208
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/common_api/common_api.ex