diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-13 22:11:16 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-13 22:11:16 +0300 |
commit | e3508988283a0902a7e330995a0c224811956bce (patch) | |
tree | edd0a0eb6301980aef5fe02653610929594607cf /lib/pleroma/web/admin_api/controllers/instance_document_controller.ex | |
parent | 3e4d84729a4ca8d9779d439a9aa2c8c23b3acd1d (diff) | |
parent | f917285b72dbc770be40478e1a55973f29d5db7d (diff) | |
download | pleroma-e3508988283a0902a7e330995a0c224811956bce.tar.gz |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers/instance_document_controller.ex')
-rw-r--r-- | lib/pleroma/web/admin_api/controllers/instance_document_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex b/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex index 37dbfeb72..ef00d3417 100644 --- a/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.AdminAPI.InstanceDocumentController do |