Merge branch 'media-proxy-fix-encoding' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Fri, 22 Dec 2017 12:07:10 +0000 (12:07 +0000)
committerlambda <pleromagit@rogerbraun.net>
Fri, 22 Dec 2017 12:07:10 +0000 (12:07 +0000)
commitad180ad6dde1d095a8b337720d6b19f0f493089d
tree667733916c05976062c449a19037d8d1e72fdb4f
parent35ac549a99f325d2e73c03d7c2951f3d6570b7b4
parent0ccd0e5cc99417428877e61d09a1fa4ea5578625
Merge branch 'media-proxy-fix-encoding' into 'develop'

Remove a useless URI.encode call in MediaProxy

See merge request pleroma/pleroma!42