Antonio Scandurra 14def2a1a3 Merge remote-tracking branch 'origin/main' into assistant-2 ... # Conflicts: # crates/ui2/src/components/icon.rs		2023-12-06 18:18:58 +01:00
..
contents	Fix bundle script	2023-11-17 17:44:41 -08:00
resources	Add temp nightly icon	2023-12-04 12:48:21 -05:00
src	Merge remote-tracking branch 'origin/main' into assistant-2	2023-12-06 18:18:58 +01:00
build.rs	Make the commit sha availabe in the app, via a global	2023-11-17 14:52:43 -08:00
Cargo.toml	Merge remote-tracking branch 'origin/main' into assistant-2	2023-12-06 12:53:02 +01:00