Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New sidebar #146

Open
wants to merge 102 commits into
base: main
Choose a base branch
from
Open

New sidebar #146

wants to merge 102 commits into from

Conversation

vood
Copy link
Contributor

@vood vood commented Jun 25, 2024

No description provided.

vood added 30 commits April 29, 2024 20:46
…ropic-2

# Conflicts:
#	components/chat/chat-input.tsx
…ropic-2

# Conflicts:
#	components/utility/profile-settings.tsx
…ropic-2

# Conflicts:
#	components/utility/profile-settings.tsx
…ropic-2

# Conflicts:
#	components/chat/chat-input.tsx
…ropic-2

# Conflicts:
#	components/chat/chat-input.tsx
…ropic-2

# Conflicts:
#	components/chat/chat-input.tsx
…ropic-2

# Conflicts:
#	components/sidebar/sidebar-switch-item.tsx
#	components/sidebar/sidebar-switcher.tsx
#	components/ui/dashboard.tsx
…ropic-2

# Conflicts:
#	components/sidebar/sidebar-switch-item.tsx
#	components/sidebar/sidebar-switcher.tsx
#	components/ui/dashboard.tsx
…ropic-2

# Conflicts:
#	app/[workspaceid]/chat/layout.tsx
#	components/sidebar/sidebar-switcher.tsx
#	components/sidebar/sidebar.tsx
#	components/sidebar2/items/chat/chat-item.tsx
#	components/sidebar2/sidebar-data-list.tsx
…ropic-2

# Conflicts:
#	app/[workspaceid]/chat/layout.tsx
#	components/sidebar/sidebar-switcher.tsx
#	components/sidebar/sidebar.tsx
#	components/sidebar2/items/chat/chat-item.tsx
#	components/sidebar2/sidebar-data-list.tsx
…ropic-2

# Conflicts:
#	app/[workspaceid]/chat/layout.tsx
#	components/sidebar/sidebar-switcher.tsx
#	components/sidebar/sidebar.tsx
#	components/sidebar2/items/chat/chat-item.tsx
#	components/sidebar2/sidebar-data-list.tsx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant