projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f33699 49afbcd)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 3 Mar 2021 13:51:07 +0000 (13:51 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 3 Mar 2021 13:51:07 +0000 (13:51 +0000)
1  2 
.gitignore patch | diff1 | diff2 | blob | history

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