diff options
author | Maxim Filippov <colixer@gmail.com> | 2019-09-22 16:58:39 +0300 |
---|---|---|
committer | Maxim Filippov <colixer@gmail.com> | 2019-09-22 16:58:39 +0300 |
commit | 02bbcd6180702828b08a37ccf214cc3b7d5ebd24 (patch) | |
tree | 73ce407b898050eeb08352ca1e8368918d1ba2bc /test/web/oauth | |
parent | f89fe3ac06505cc07372fcdefdc3fde72d1f04a0 (diff) | |
parent | 472e7b796cfeb1445ee1572df414531655b050ce (diff) | |
download | pleroma-02bbcd6180702828b08a37ccf214cc3b7d5ebd24.tar.gz pleroma-02bbcd6180702828b08a37ccf214cc3b7d5ebd24.zip |
Merge branch 'develop' into feature/return-link-for-password-reset
Diffstat (limited to 'test/web/oauth')
-rw-r--r-- | test/web/oauth/authorization_test.exs | 2 | ||||
-rw-r--r-- | test/web/oauth/oauth_controller_test.exs | 2 | ||||
-rw-r--r-- | test/web/oauth/token/utils_test.exs | 2 | ||||
-rw-r--r-- | test/web/oauth/token_test.exs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/web/oauth/authorization_test.exs b/test/web/oauth/authorization_test.exs index d8b008437..2e82a7b79 100644 --- a/test/web/oauth/authorization_test.exs +++ b/test/web/oauth/authorization_test.exs @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.OAuth.AuthorizationTest do diff --git a/test/web/oauth/oauth_controller_test.exs b/test/web/oauth/oauth_controller_test.exs index b492c7794..2780e1746 100644 --- a/test/web/oauth/oauth_controller_test.exs +++ b/test/web/oauth/oauth_controller_test.exs @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.OAuth.OAuthControllerTest do diff --git a/test/web/oauth/token/utils_test.exs b/test/web/oauth/token/utils_test.exs index 20e338cab..dc1f9a986 100644 --- a/test/web/oauth/token/utils_test.exs +++ b/test/web/oauth/token/utils_test.exs @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.OAuth.Token.UtilsTest do diff --git a/test/web/oauth/token_test.exs b/test/web/oauth/token_test.exs index 3c07309b7..5359940f8 100644 --- a/test/web/oauth/token_test.exs +++ b/test/web/oauth/token_test.exs @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.OAuth.TokenTest do |