projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82bf271 6b01a09)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
authorlain <lain@soykaf.club>
Fri, 28 Aug 2020 09:33:11 +0000 (11:33 +0200)
committerlain <lain@soykaf.club>
Fri, 28 Aug 2020 09:33:11 +0000 (11:33 +0200)
1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history

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