Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into migrations-on-server-start

Browse source
This commit is contained in:
Conrad Irwin 2024-01-09 09:43:14 -07:00
commit bebb528656
130 changed files with 1924 additions and 1289 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/collab/src/lib.rs
View file

@ -88,7 +88,7 @@ impl std::fmt::Display for Error {
impl std::error::Error for Error {}
#[derive(Default, Deserialize)]
#[derive(Deserialize)]
pub struct Config {
pub http_port: u16,
pub database_url: String,
@ -100,7 +100,7 @@ pub struct Config {
pub live_kit_secret: Option<String>,
pub rust_log: Option<String>,
pub log_json: Option<bool>,
pub zed_environment: String,
pub zed_environment: Arc<str>,
}
impl Config {