Antonio Scandurra 7e411ae098 Merge branch 'main' into screen-sharing ... # Conflicts: # crates/collab/src/integration_tests.rs # crates/collab/src/main.rs # styles/src/styleTree/workspace.ts		2022-10-21 14:29:45 +02:00
..
examples	Remove dispatch_event from Element trait	2022-10-16 13:08:25 -06:00
grammars/context-predicate	WIP compiling but failing with circular reference	2022-08-09 17:15:52 -07:00
src	Merge branch 'main' into screen-sharing	2022-10-21 14:29:45 +02:00
build.rs	Bump minimum macOS version to 10.15.7	2022-10-20 18:01:41 +02:00
Cargo.toml	Add assertion context manager to TestAppContext and convert existing vim tests to use neovim backed test context	2022-10-10 14:46:07 -07:00