Merge branch 'master' into lunny/fix_round_display_since_time

6543 · web-flow · commit bf26babe969b · 2021-01-27T17:16:12.000+01:00
diff --git a/build/generate-svg.js b/build/generate-svg.js
@@ -65,7 +65,7 @@ async function main() {
   await Promise.all([
     ...processFiles('../node_modules/@primer/octicons/build/svg/*-16.svg', {prefix: 'octicon'}),
     ...processFiles('../web_src/svg/*.svg'),
-    ...processFiles('../assets/logo.svg', {fullName: 'gitea-gitea'}),
+    ...processFiles('../public/img/gitea.svg', {fullName: 'gitea-gitea'}),
   ]);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ async function main() {`
`65`	`65`	`await Promise.all([`
`66`	`66`	`...processFiles('../node_modules/@primer/octicons/build/svg/*-16.svg', {prefix: 'octicon'}),`
`67`	`67`	`...processFiles('../web_src/svg/*.svg'),`
`68`		`- ...processFiles('../assets/logo.svg', {fullName: 'gitea-gitea'}),`
	`68`	`+ ...processFiles('../public/img/gitea.svg', {fullName: 'gitea-gitea'}),`
`69`	`69`	`]);`
`70`	`70`	`}`
`71`	`71`