Merge branch 'master' into develop

isekai-main
Julian Lam 2 years ago
commit e4cfc5fa2e

@ -167,7 +167,7 @@
"smtp-server": "3.11.0" "smtp-server": "3.11.0"
}, },
"resolutions": { "resolutions": {
"timeago/jquery": "3.6.0" "*/jquery": "3.6.0"
}, },
"bugs": { "bugs": {
"url": "https://github.com/NodeBB/NodeBB/issues" "url": "https://github.com/NodeBB/NodeBB/issues"

Loading…
Cancel
Save