projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b540fff 745375b)
Merge remote-tracking branch 'pleroma/develop' into optional-config
authorAlex Gleason <alex@alexgleason.me>
Sun, 16 May 2021 17:27:29 +0000 (12:27 -0500)
committerAlex Gleason <alex@alexgleason.me>
Sun, 16 May 2021 17:27:29 +0000 (12:27 -0500)

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