Merge branch 'release/v1.20' into blender-merged-develop

blender · Aug 1, 2023 · 5360cab · 5360cab
2 parents 1ba8693 + 2517da9
commit 5360cab
Show file tree

Hide file tree

Showing 1,819 changed files with 48,808 additions and 157,100 deletions.
diff --git a/.air.toml b/.air.toml
@@ -2,7 +2,7 @@ root = "."
 tmp_dir = ".air"
 
 [build]
-cmd = "make backend"
+cmd = "make --no-print-directory backend"
 bin = "gitea"
 delay = 1000
 include_ext = ["go", "tmpl"]

diff --git a/.dockerignore b/.dockerignore
@@ -76,7 +76,6 @@ cpu.out
 /yarn-error.log
 /npm-debug.log*
 /public/js
-/public/serviceworker.js
 /public/css
 /public/fonts
 /public/img/webpack