diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-08 14:10:45 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-08 14:10:59 +0300 |
| commit | edb659dc579fe56227adef0b0704ff13b6ef717e (patch) | |
| tree | e9d48cd8afd99877d5b4c696d8b7a62a9d2121bd /test/web/media_proxy | |
| parent | 10f452ad1feae9a882b6dc4cd35e09adb7e78208 (diff) | |
| parent | 6d797b99282ff1067c6af04b3e1775ff2281333b (diff) | |
| download | pleroma-edb659dc579fe56227adef0b0704ff13b6ef717e.tar.gz pleroma-edb659dc579fe56227adef0b0704ff13b6ef717e.zip | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/web/media_proxy')
| -rw-r--r-- | test/web/media_proxy/media_proxy_controller_test.exs | 2 | ||||
| -rw-r--r-- | test/web/media_proxy/media_proxy_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/web/media_proxy/media_proxy_controller_test.exs b/test/web/media_proxy/media_proxy_controller_test.exs index 8c0c2a0e2..f035dfeee 100644 --- a/test/web/media_proxy/media_proxy_controller_test.exs +++ b/test/web/media_proxy/media_proxy_controller_test.exs @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do diff --git a/test/web/media_proxy/media_proxy_test.exs b/test/web/media_proxy/media_proxy_test.exs index 2be5c9de0..8f5fcf2eb 100644 --- a/test/web/media_proxy/media_proxy_test.exs +++ b/test/web/media_proxy/media_proxy_test.exs @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.MediaProxyTest do |