diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:41:57 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:41:57 +0300 |
| commit | 179fa32dd5d7b4cf1b338fc3df4840ae33525606 (patch) | |
| tree | d674301d9d20e9da88bedff49d3d8a56646284d8 /test/web/media_proxy | |
| parent | bc3e8c033bbef303890ff6afa92d1fe365e530fb (diff) | |
| parent | fd48bd80eb7eab563c25586b1deba2ed42c02c5a (diff) | |
| download | pleroma-179fa32dd5d7b4cf1b338fc3df4840ae33525606.tar.gz pleroma-179fa32dd5d7b4cf1b338fc3df4840ae33525606.zip | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
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 |