Merge branch 'master' into menus

2021-04-09 10:34:21 -07:00 · 2021-04-09 10:34:21 -07:00 · 00d7dafbba
commit 00d7dafbba
parent 6873662c47 07b8a105a6
38 changed files with 1105 additions and 186 deletions
--- a/gpui/src/platform/test.rs
+++ b/gpui/src/platform/test.rs
@ -52,6 +52,8 @@ impl super::App for App {
    fn prompt_for_paths(&self, _: super::PathPromptOptions) -> Option<Vec<std::path::PathBuf>> {
        None
    }
+
+    fn copy(&self, _: &str) {}
 }

 impl Window {