diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-08 14:10:45 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-08 14:10:59 +0300 |
commit | edb659dc579fe56227adef0b0704ff13b6ef717e (patch) | |
tree | e9d48cd8afd99877d5b4c696d8b7a62a9d2121bd /lib/pleroma/web/mastodon_api/controllers/instance_controller.ex | |
parent | 10f452ad1feae9a882b6dc4cd35e09adb7e78208 (diff) | |
parent | 6d797b99282ff1067c6af04b3e1775ff2281333b (diff) | |
download | pleroma-edb659dc579fe56227adef0b0704ff13b6ef717e.tar.gz |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/instance_controller.ex')
-rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/instance_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex b/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex index a55f60fec..27b5b1a52 100644 --- a/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/instance_controller.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.Web.MastodonAPI.InstanceController do |