Merge branch '1.6.X'

# Conflicts: # server/database.js # server/server.js
2025-08-09 11:17:43 +08:00 · 2021-09-24 19:12:57 +08:00
parent 51512b6f5f 76a39f1388
commit 0afa3a2c21
3 changed files with 12 additions and 12 deletions
--- a/1
+++ b/1
@@ -1,4 +1,5 @@
 # DON'T UPDATE TO node:14-bullseye-slim, see #372.
+# If the image changed, the second stage image should be changed too
 FROM node:14-buster-slim AS build
 WORKDIR /app