projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ff8f07 d93d777)
Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'
authorfeld <feld@feld.me>
Fri, 2 Aug 2019 17:07:09 +0000 (17:07 +0000)
committerfeld <feld@feld.me>
Fri, 2 Aug 2019 17:07:09 +0000 (17:07 +0000)
Fix/mediaproxy whitelist base url

See merge request pleroma/pleroma!1486


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