duckietm/Nitro-V3
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro-V3.git synced 2026-06-19 23:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'duckie-temp/main' into duckie-merge-2026-04-21

Browse Source 
# Conflicts:
#	src/components/room/widgets/chat-input/ChatInputView.tsx
#	src/components/toolbar/ToolbarView.tsx
#	src/css/chat/Chats.css
#	src/css/nitrocard/NitroCardView.css
#	src/css/purse/PurseView.css
#	src/css/room/RoomWidgets.css
This commit is contained in:
Lorenzune
2026-04-21 11:19:59 +02:00
parent 9b36513def 4d5e475bae
commit 58e0ed30f6
43 changed files with 1453 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/MainView.tsx
-2
View File
@@ -34,7 +34,6 @@ import { UserProfileView } from './user-profile/UserProfileView';
import { UserSettingsView } from './user-settings/UserSettingsView';
import { WiredView } from './wired/WiredView';
import { WiredCreatorToolsView } from './wired-tools/WiredCreatorToolsView';
import { YoutubeTvView } from './youtube-tv/YoutubeTvView';
export const MainView: FC<{}> = props =>
{
@@ -141,7 +140,6 @@ export const MainView: FC<{}> = props =>
<GameCenterView />
<FloorplanEditorView />
<FurniEditorView />
<YoutubeTvView />
<ExternalPluginLoader />
</>
);