diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-02 15:35:49 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-02 15:35:49 +0400 |
| commit | 4a45b96a91485a39f26bcc86b6cbd21d1547511e (patch) | |
| tree | b4a6cc3f7be26b84b85d3a1ff3adc9b896b54e85 /test/web/mastodon_api/views | |
| parent | f446744a6a72d707504c2ba20ea2326f956b5097 (diff) | |
| parent | 45b08ca1665920564c9daf35a96e93dff031a649 (diff) | |
| download | pleroma-4a45b96a91485a39f26bcc86b6cbd21d1547511e.tar.gz pleroma-4a45b96a91485a39f26bcc86b6cbd21d1547511e.zip | |
Merge branch 'develop' into fix/signup-without-email
Diffstat (limited to 'test/web/mastodon_api/views')
| -rw-r--r-- | test/web/mastodon_api/views/account_view_test.exs | 2 | ||||
| -rw-r--r-- | test/web/mastodon_api/views/notification_view_test.exs | 2 | ||||
| -rw-r--r-- | test/web/mastodon_api/views/status_view_test.exs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs index 00c294845..d60ed7b64 100644 --- a/test/web/mastodon_api/views/account_view_test.exs +++ b/test/web/mastodon_api/views/account_view_test.exs @@ -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.AccountViewTest do diff --git a/test/web/mastodon_api/views/notification_view_test.exs b/test/web/mastodon_api/views/notification_view_test.exs index 2ac75c2ff..4df9c3c03 100644 --- a/test/web/mastodon_api/views/notification_view_test.exs +++ b/test/web/mastodon_api/views/notification_view_test.exs @@ -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.NotificationViewTest do diff --git a/test/web/mastodon_api/views/status_view_test.exs b/test/web/mastodon_api/views/status_view_test.exs index 560f8179f..191895c6f 100644 --- a/test/web/mastodon_api/views/status_view_test.exs +++ b/test/web/mastodon_api/views/status_view_test.exs @@ -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.StatusViewTest do |