projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a744cd f909aec)
Merge branch 'media-proxy' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Wed, 20 Dec 2017 14:22:24 +0000 (14:22 +0000)
committerlambda <pleromagit@rogerbraun.net>
Wed, 20 Dec 2017 14:22:24 +0000 (14:22 +0000)
Media proxy

See merge request pleroma/pleroma!34

1  2 
lib/pleroma/formatter.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/formatter.ex
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git