[#2497] Resolved merge conflicts.
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 21 Jul 2020 17:03:14 +0000 (20:03 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 21 Jul 2020 17:03:14 +0000 (20:03 +0300)
commitb8021016ebef23903c59e5140d4efb456a84a347
tree4dbe142af98e3af5d0bf75b333f90b9615dc0b41
parentbdf57b8ef438f32999ef917777b13161320644a8
[#2497] Resolved merge conflicts.
test/web/media_proxy/media_proxy_controller_test.exs
test/web/media_proxy/media_proxy_test.exs