f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-05 12:22:44 +00:00
Code Wiki Activity

Merge branch 'master' into metadata-document-block

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Charlie Humphreys
2021-12-01 10:37:03 -06:00
parent db3980a716 ce5058538d
commit fadfe7d091
2 changed files with 9633 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9670
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@@ -54,7 +54,7 @@
"express-async-handler": "^1.1.4", "express-async-handler": "^1.1.4",
"express-static-gzip": "2.1.1", "express-static-gzip": "2.1.1",
"fs-extra": "10.0.0", "fs-extra": "10.0.0",
"googleapis": "91.0.0", "googleapis": "92.0.0",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"jwt-simple": "^0.5.6", "jwt-simple": "^0.5.6",
"less": "^3.13.1", "less": "^3.13.1",
@@ -62,7 +62,7 @@
"marked": "3.0.8", "marked": "3.0.8",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.1", "moment": "^2.29.1",
"mongoose": "^6.0.13", "mongoose": "^6.0.14",
"nanoid": "3.1.30", "nanoid": "3.1.30",
"nconf": "^0.11.3", "nconf": "^0.11.3",
"prop-types": "15.7.2", "prop-types": "15.7.2",