Merge branch 'master' into metadata-document-block

# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Charlie Humphreys committed 2021-12-01 10:37:03 -06:00
commit fadfe7d091
2 files changed
+9633 -41

No files matched your search

+9631 -39
View File
File diff suppressed because it is too large. Load diff
+2 -2
View File
@@ -54,7 +54,7 @@
"express-async-handler": "^1.1.4",
"express-static-gzip": "2.1.1",
"fs-extra": "10.0.0",
"googleapis": "91.0.0",
"googleapis": "92.0.0",
"js-yaml": "^4.1.0",
"jwt-simple": "^0.5.6",
"less": "^3.13.1",
@@ -62,7 +62,7 @@
"marked": "3.0.8",
"markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.1",
"mongoose": "^6.0.13",
"mongoose": "^6.0.14",
"nanoid": "3.1.30",
"nconf": "^0.11.3",
"prop-types": "15.7.2",