projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c5b5f1 ab36459)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction...
authorlain <lain@soykaf.club>
Mon, 20 Jan 2020 17:10:55 +0000 (18:10 +0100)
committerlain <lain@soykaf.club>
Mon, 20 Jan 2020 17:10:55 +0000 (18:10 +0100)
1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history

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