Merge branch 'main' into 'elio-server'

# Conflicts: # c2/Cargo.toml # c2/src/db.rs # c2/src/main.rs

Merge branch 'main' into 'elio-server'
411f008d · leo.muff · 28d29ac0 · bcc21326 · 28d29ac0 · 28d29ac0
Commit 411f008d authored 1 year ago by leo.muff
--- a/c2/templates/static/bootstrap/css/bootstrap-reboot.min.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap-reboot.min.css.map
--- a/c2/templates/static/bootstrap/css/bootstrap-reboot.rtl.css
+++ b/c2/templates/static/bootstrap/css/bootstrap-reboot.rtl.css
--- a/c2/templates/static/bootstrap/css/bootstrap-reboot.rtl.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap-reboot.rtl.css.map
--- a/c2/templates/static/bootstrap/css/bootstrap-reboot.rtl.min.css
+++ b/c2/templates/static/bootstrap/css/bootstrap-reboot.rtl.min.css
--- a/c2/templates/static/bootstrap/css/bootstrap-reboot.rtl.min.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap-reboot.rtl.min.css.map
--- a/c2/templates/static/bootstrap/css/bootstrap-utilities.css
+++ b/c2/templates/static/bootstrap/css/bootstrap-utilities.css
--- a/c2/templates/static/bootstrap/css/bootstrap-utilities.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap-utilities.css.map
--- a/c2/templates/static/bootstrap/css/bootstrap-utilities.min.css
+++ b/c2/templates/static/bootstrap/css/bootstrap-utilities.min.css
--- a/c2/templates/static/bootstrap/css/bootstrap-utilities.min.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap-utilities.min.css.map
--- a/c2/templates/static/bootstrap/css/bootstrap-utilities.rtl.css
+++ b/c2/templates/static/bootstrap/css/bootstrap-utilities.rtl.css
--- a/c2/templates/static/bootstrap/css/bootstrap-utilities.rtl.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap-utilities.rtl.css.map
--- a/c2/templates/static/bootstrap/css/bootstrap-utilities.rtl.min.css
+++ b/c2/templates/static/bootstrap/css/bootstrap-utilities.rtl.min.css
--- a/c2/templates/static/bootstrap/css/bootstrap-utilities.rtl.min.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap-utilities.rtl.min.css.map
--- a/c2/templates/static/bootstrap/css/bootstrap.css
+++ b/c2/templates/static/bootstrap/css/bootstrap.css
--- a/c2/templates/static/bootstrap/css/bootstrap.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap.css.map
--- a/c2/templates/static/bootstrap/css/bootstrap.min.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap.min.css.map
--- a/c2/templates/static/bootstrap/css/bootstrap.rtl.css
+++ b/c2/templates/static/bootstrap/css/bootstrap.rtl.css
--- a/c2/templates/static/bootstrap/css/bootstrap.rtl.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap.rtl.css.map
--- a/c2/templates/static/bootstrap/css/bootstrap.rtl.min.css
+++ b/c2/templates/static/bootstrap/css/bootstrap.rtl.min.css
--- a/c2/templates/static/bootstrap/css/bootstrap.rtl.min.css.map
+++ b/c2/templates/static/bootstrap/css/bootstrap.rtl.min.css.map