diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-06 11:48:30 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-06 11:48:30 +0300 |
commit | 027714b519cca63ac943369d0bcc9534ba448a80 (patch) | |
tree | ab331c60efe243bd6eb79c95b67dc797bb165078 /lib/pleroma/reverse_proxy | |
parent | 40765875d41f181b4ac54a772b4c61d6afc0bc34 (diff) | |
parent | 47604907c9d2379d0883d63bc7add5782cc25d63 (diff) | |
download | pleroma-027714b519cca63ac943369d0bcc9534ba448a80.tar.gz |
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
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 |