Jamie Pine c4226f0e7a Merge branch 'eng-259-identify-objectkind' ... Conflicts: apps/landing/package.json apps/landing/vite.config.ts packages/interface/src/AppLayout.tsx packages/interface/src/components/explorer/Explorer.tsx packages/interface/src/components/explorer/ExplorerTopBar.tsx packages/ui/src/ContextMenu.tsx pnpm-lock.yaml		2022-10-20 22:49:15 -07:00
..
dist	keep dist folder in desktop	2022-08-19 09:03:47 +08:00
src	merge	2022-10-20 21:55:39 -07:00
src-tauri	upgrade rspc + fix reactivity + add in disabled Normi code	2022-10-18 04:45:37 +08:00
app-icon.png	update icons	2022-04-22 16:59:25 +08:00
package.json	Merge branch 'eng-259-identify-objectkind'	2022-10-20 22:49:15 -07:00
postcss.config.js	better compile setup for hotreload	2022-04-19 14:17:04 -07:00
tailwind.config.js	holy mother of hot reload	2022-04-20 01:15:28 -07:00
tsconfig.json	Added crates folder (#389)	2022-09-29 21:02:29 -07:00
vite.config.ts	Merge remote-tracking branch 'origin/main' into use-rust-shortcuts	2022-09-15 02:15:40 -05:00