projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1fd4f6 952cb58)
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>
Thu, 19 Mar 2020 18:25:50 +0000 (19:25 +0100)
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>
Thu, 19 Mar 2020 18:25:50 +0000 (19:25 +0100)

Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git