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)
commit35ac549a99f325d2e73c03d7c2951f3d6570b7b4
treed79e7f5b5d82e3c4098895dcdec2e872ad84fc3e
parent2a744cdff8a94d92683ab1a16f89bb51112006f8
parentf909aec050498a366d8b0ed6c1b5439b5b0891f1
Merge branch 'media-proxy' into 'develop'

Media proxy

See merge request pleroma/pleroma!34
lib/pleroma/formatter.ex
lib/pleroma/web/router.ex