diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-03-02 05:15:13 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-03-02 05:15:13 +0000 |
| commit | 6ceef768cba23ab79a5545330746c7d8ce97ed64 (patch) | |
| tree | 7dda3c81eb3b2dd6bdd883ff107883c62ce01604 /test/web/media_proxy | |
| parent | 6471c09372204a9fec20cd58492149862e389d24 (diff) | |
| parent | 6da65400362d2189a995a182789c099b108b26bc (diff) | |
| download | pleroma-6ceef768cba23ab79a5545330746c7d8ce97ed64.tar.gz pleroma-6ceef768cba23ab79a5545330746c7d8ce97ed64.zip | |
Merge branch 'chores/bump-copyright' into 'develop'
Bump copyright
See merge request pleroma/pleroma!2265
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 |