projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 189e9d6 066fe1a)
Merge branch 'pr-upstream-http-proxy' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 30 Jan 2018 08:16:31 +0000 (08:16 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 30 Jan 2018 08:16:31 +0000 (08:16 +0000)
Pr upstream http proxy

See merge request pleroma/pleroma!43


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