Merge remote-tracking branch 'origin/develop' into feature/update_to_…

…node20
TriliumNext · Jul 20, 2024 · 9b9180e · 9b9180e
2 parents 460bd6b + 05776d1
commit 9b9180e
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 5 deletions.
diff --git a/docs-new/.env.example → bin/docs/.env.example b/docs-new/.env.example → bin/docs/.env.example
diff --git a/bin/docs/.gitignore b/bin/docs/.gitignore
@@ -0,0 +1,2 @@
+output
+.env
diff --git a/docs-new/index.template.html → bin/docs/index.template.html b/docs-new/index.template.html → bin/docs/index.template.html
diff --git a/docs-new/prepare.sh → bin/docs/prepare.sh b/docs-new/prepare.sh → bin/docs/prepare.sh
diff --git a/docs-new/preview.sh → bin/docs/preview.sh b/docs-new/preview.sh → bin/docs/preview.sh
diff --git a/docs-new/.env b/docs-new/.env
diff --git a/docs-new/.gitignore b/docs-new/.gitignore