projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a3a399 3ae1183)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 4 Feb 2019 17:38:05 +0000 (00:38 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 4 Feb 2019 17:38:05 +0000 (00:38 +0700)

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