projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fabf83 c623b43)
Merge branch 'revert-4fabf83a' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 16 Sep 2019 09:09:32 +0000 (09:09 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 16 Sep 2019 09:09:32 +0000 (09:09 +0000)
Revert "Merge branch 'streamer-refactoring' into 'develop'"

See merge request pleroma/pleroma!1674


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