diff options
| author | tusooa <tusooa@kazv.moe> | 2022-07-31 21:32:49 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-07-31 21:32:49 +0000 |
| commit | c80096522cad1255f53e171359bc0266822c6441 (patch) | |
| tree | 102a7e13b2e4c11af54e14a9ab0b3be216ce6013 /test/support/cachex_proxy.ex | |
| parent | 9a27cb4f9d314fe1066f566de71357f55926116e (diff) | |
| parent | b5266097a1e73bd749d8176e327c14fcb9735f95 (diff) | |
| download | pleroma-c80096522cad1255f53e171359bc0266822c6441.tar.gz pleroma-c80096522cad1255f53e171359bc0266822c6441.zip | |
Merge branch 'develop' into 'from/develop/tusooa/emit-move'
# Conflicts:
# CHANGELOG.md
# test/pleroma/user_test.exs
Diffstat (limited to 'test/support/cachex_proxy.ex')
| -rw-r--r-- | test/support/cachex_proxy.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/support/cachex_proxy.ex b/test/support/cachex_proxy.ex index de1f1c766..83ae5610f 100644 --- a/test/support/cachex_proxy.ex +++ b/test/support/cachex_proxy.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.CachexProxy do |