Commit 2988883
committed
Merge branch 'dev'
# Conflicts:
# Cargo.lock
# Cargo.toml
# src/api/metrics.rs
# src/api/mod.rs
# src/api/proxy.rs
# src/api/routes.rs
# src/api/tls.rs
# src/config/listener.rs
# src/config/mod.rs
# src/config/records.rs
# src/dns/authority.rs
# src/dns/handler.rs
# src/dns/mod.rs
# src/main.rs
# src/util.rsFile tree
18 files changed
+1116
-588
lines changed- .idea/runConfigurations
- src
- api
- config
- dns
18 files changed
+1116
-588
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments