diff options
| author | kPherox <admin@mail.kr-kp.com> | 2019-10-01 01:39:22 +0900 |
|---|---|---|
| committer | kPherox <admin@mail.kr-kp.com> | 2019-10-01 01:40:33 +0900 |
| commit | a0f101ee806af06bcd4271cd8d57d11ff85ea11a (patch) | |
| tree | 2cd3c5d1a645be1395c57ec5616f31afb4b68da7 /test/web/media_proxy | |
| parent | 8ca4f145a51e92c9f3a6c374ceddfac22ea300d9 (diff) | |
| parent | 7c9b023a918c84b60ae6547289a083c671a3659b (diff) | |
| download | pleroma-a0f101ee806af06bcd4271cd8d57d11ff85ea11a.tar.gz pleroma-a0f101ee806af06bcd4271cd8d57d11ff85ea11a.zip | |
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
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 53b8f556b..fdfdb5ec6 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-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2019 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 79699cac5..96bdde219 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-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.MediaProxyTest do |