Merge branch 'main' into disconnected-status

2022-03-04 10:07:26 -07:00
parent c38de3243d d59451fb08
commit a72d58a28c
22 changed files with 115 additions and 13 deletions
@@ -849,7 +849,7 @@ mod tests {
        lazy_static::lazy_static! {
            static ref DEFAULT_THEME: parking_lot::Mutex<Option<Arc<Theme>>> = Default::default();
            static ref FONTS: Vec<Arc<Vec<u8>>> = vec![
-                Assets.load("fonts/zed-sans/zed-sans-regular.ttf").unwrap().to_vec().into()
+                Assets.load("fonts/zed-sans/zed-sans-extended.ttf").unwrap().to_vec().into()
            ];
        }