projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d90291 4655407)
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)
Global status expiration

See merge request pleroma/pleroma!2208

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/activity_pub/activity_pub.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/common_api/common_api.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git