diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-03-03 17:15:49 -0600 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-03-03 17:15:49 -0600 |
commit | 4427161ca3798aeee0290f0ed7ac5536039509d8 (patch) | |
tree | ed45b8f7e551accff90eec1fb86d15fcecaea6b8 /lib/pleroma/reverse_proxy | |
parent | 884d9710b209cc9981c7de61d4e95fd26cd83820 (diff) | |
parent | 5992c256ad7c5bc8207240c9d51e03964e50eb64 (diff) | |
download | pleroma-4427161ca3798aeee0290f0ed7ac5536039509d8.tar.gz |
Merge branch 'develop' into gun
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 63261b94c..0d13ff174 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 9f5710c92..8f1aa3200 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 |