projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4200a06 ca7cf62)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
authorlain <lain@soykaf.club>
Tue, 5 Jan 2021 11:42:30 +0000 (12:42 +0100)
committerlain <lain@soykaf.club>
Tue, 5 Jan 2021 11:42:30 +0000 (12:42 +0100)
1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history

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