Jamie Pine 3a3ec6251f Merge branch 'main' ... Conflicts: packages/interface/src/screens/settings/library/LibraryGeneralSettings.tsx		2022-10-23 18:43:27 -07:00
..
crypto	[ENG-258] Key Manager and Crypto Crate Improvements (#423)	2022-10-23 03:47:41 -07:00
ffmpeg	merge duplicate prettier config and format repo with it	2022-10-07 07:45:15 +08:00
file-ext	finish theming	2022-10-23 03:24:46 -07:00
p2p	Merge branch 'main' of https://github.com/spacedriveapp/spacedrive	2022-10-17 01:36:05 -07:00
prisma-cli	move prisma schema and migrations to /core (#392)	2022-10-04 02:32:46 -07:00
sync	Merge branch 'eng-259-identify-objectkind'	2022-10-20 22:49:15 -07:00