Merge branch 'master' into addLocalLogin-#269

2025-12-30 17:32:38 +00:00 · 2022-04-13 14:30:02 +12:00
parent 5d3fe719b3 b11fe0e760
commit ad8d5bd8a0
20 changed files with 795 additions and 480 deletions
--- a/server/app.js
+++ b/server/app.js
@@ -291,6 +291,7 @@ app.use((req, res)=>{
 	};
 	const props = {
 		version     : require('./../package.json').version,
+		publicUrl   : config.get('publicUrl') ?? '',
 		url         : req.originalUrl,
 		brew        : req.brew,
 		brews       : req.brews,