projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac0a8df 7bcd2e9)
Merge branch 'deactivate-gun-again' into 'develop'
authorlain <lain@soykaf.club>
Fri, 31 Jul 2020 09:11:24 +0000 (09:11 +0000)
committerlain <lain@soykaf.club>
Fri, 31 Jul 2020 09:11:24 +0000 (09:11 +0000)
Config: Default to Hackney again

See merge request pleroma/pleroma!2821


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