[#2497] Fixed merge issue.
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 5 Jul 2020 16:02:43 +0000 (19:02 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 5 Jul 2020 16:02:43 +0000 (19:02 +0300)
commit9faa63203717e71d666afb6755ff0b781b491823
tree5a1cb59cc6f9621e9e016eec4481e171cb2a2f32
parent61180ab6f4b85ab78de2eaf1bc1b974c9e7908af
[#2497] Fixed merge issue.
lib/pleroma/web/media_proxy/media_proxy_controller.ex