Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/users/notes.ts
This commit is contained in:
mattyatea 2023-10-08 15:44:52 +09:00
commit 38b9bc3a4d
17 changed files with 238 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
View file

@ -16,7 +16,7 @@ import Channel from '../channel.js';
class HybridTimelineChannel extends Channel {
public readonly chName = 'hybridTimeline';
public static shouldShare = true;
public static shouldShare = false;
public static requireCredential = true;
private withReplies: boolean;
private withFiles: boolean;