Skip to content

Commit 68527fc

Browse files
committed
Merge branch 'master' into deployment
merge
2 parents 5a927af + f0ddbe1 commit 68527fc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"express-session": "^1.15.5",
2222
"googleapis": "^21.3.0",
2323
"jquery": "^3.2.1",
24-
"marked": "^0.3.7",
24+
"marked": "^0.3.9",
2525
"qr-image": "^3.2.0",
2626
"url-regex": "^4.1.1",
2727
"uuid-regexp": "^0.3.0"

0 commit comments

Comments
 (0)