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/daemons | |
| 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/daemons')
| -rw-r--r-- | test/daemons/activity_expiration_daemon_test.exs | 2 | ||||
| -rw-r--r-- | test/daemons/scheduled_activity_daemon_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/daemons/activity_expiration_daemon_test.exs b/test/daemons/activity_expiration_daemon_test.exs index 31f4a70a6..b51132fb0 100644 --- a/test/daemons/activity_expiration_daemon_test.exs +++ b/test/daemons/activity_expiration_daemon_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.ActivityExpirationWorkerTest do diff --git a/test/daemons/scheduled_activity_daemon_test.exs b/test/daemons/scheduled_activity_daemon_test.exs index 32820b2b7..c8e464491 100644 --- a/test/daemons/scheduled_activity_daemon_test.exs +++ b/test/daemons/scheduled_activity_daemon_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.ScheduledActivityDaemonTest do |