projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6163fbf ba3f3a5)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
authorlain <lain@soykaf.club>
Wed, 4 Nov 2020 12:23:18 +0000 (13:23 +0100)
committerlain <lain@soykaf.club>
Wed, 4 Nov 2020 12:23:18 +0000 (13:23 +0100)
1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history

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