diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-08 10:38:35 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-08 10:38:35 +0000 |
| commit | e8493431bfc16977e43715bf8bdb09ac46580028 (patch) | |
| tree | 2e1a0068583ca62870a15590c4ccba237999f51a /lib/pleroma/reverse_proxy | |
| parent | 42f76306e7fe69fc51be00285a4fef8569f54989 (diff) | |
| parent | e7c49d51d724680c1f19888ea409687733753c7b (diff) | |
| download | pleroma-e8493431bfc16977e43715bf8bdb09ac46580028.tar.gz pleroma-e8493431bfc16977e43715bf8bdb09ac46580028.zip | |
Merge branch 'release/2.0.0' into 'stable'
Release/2.0.0
See merge request pleroma/pleroma!2273
Diffstat (limited to 'lib/pleroma/reverse_proxy')
| -rw-r--r-- | lib/pleroma/reverse_proxy/client.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/reverse_proxy/reverse_proxy.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/reverse_proxy/client.ex b/lib/pleroma/reverse_proxy/client.ex index 776c4794c..26d14fabd 100644 --- a/lib/pleroma/reverse_proxy/client.ex +++ b/lib/pleroma/reverse_proxy/client.ex @@ -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.ReverseProxy.Client do diff --git a/lib/pleroma/reverse_proxy/reverse_proxy.ex b/lib/pleroma/reverse_proxy/reverse_proxy.ex index 2ed719315..a281a00dc 100644 --- a/lib/pleroma/reverse_proxy/reverse_proxy.ex +++ b/lib/pleroma/reverse_proxy/reverse_proxy.ex @@ -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.ReverseProxy do |