diff options
| author | Marie <marie@kaifa.ch> | 2024-02-19 19:06:30 +0000 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-02-19 19:06:30 +0000 |
| commit | e248e412872dc76ec13f4e0258f4af91dc09cafa (patch) | |
| tree | b7a7ef817b62215352cf895aad87c758af833008 /packages/backend/src/server/api/endpoints/mute | |
| parent | rename to get it applied after upstream changes (diff) | |
| parent | merge: Merge upstream from 19th Feburary (!428) (diff) | |
| download | sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.tar.gz sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.tar.bz2 sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.zip | |
fix: merge conflict
Diffstat (limited to 'packages/backend/src/server/api/endpoints/mute')
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/server/api/endpoints/mute/create.ts b/packages/backend/src/server/api/endpoints/mute/create.ts index 1d931150e1..e39c133b43 100644 --- a/packages/backend/src/server/api/endpoints/mute/create.ts +++ b/packages/backend/src/server/api/endpoints/mute/create.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and other misskey contributors + * SPDX-FileCopyrightText: syuilo and misskey-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/mute/delete.ts b/packages/backend/src/server/api/endpoints/mute/delete.ts index a3fd2dd82f..d11832858e 100644 --- a/packages/backend/src/server/api/endpoints/mute/delete.ts +++ b/packages/backend/src/server/api/endpoints/mute/delete.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and other misskey contributors + * SPDX-FileCopyrightText: syuilo and misskey-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/mute/list.ts b/packages/backend/src/server/api/endpoints/mute/list.ts index 2a41182ebc..23204f2829 100644 --- a/packages/backend/src/server/api/endpoints/mute/list.ts +++ b/packages/backend/src/server/api/endpoints/mute/list.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and other misskey contributors + * SPDX-FileCopyrightText: syuilo and misskey-project * SPDX-License-Identifier: AGPL-3.0-only */ |