upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #23152 from nextcloud/dependabot/npm_and_yarn/marked-1.2.0

Browse source
This commit is contained in:
John Molakvoæ 2020-10-03 14:40:59 +02:00 committed by GitHub
commit 50b210b50f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/settings/js/vue-settings-apps-users-management.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-apps-users-management.js.map
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-vendors-settings-apps-75372ae4f32084a7d157.js Normal file
View file

File diff suppressed because one or more lines are too long

1
apps/settings/js/vue-vendors-settings-apps-75372ae4f32084a7d157.js.map Normal file
View file

File diff suppressed because one or more lines are too long

6
package-lock.json generated
View file

@ -5941,9 +5941,9 @@
}
},
"marked": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz",
"integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/marked/-/marked-1.2.0.tgz",
"integrity": "sha512-tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA=="
},
"material-colors": {
"version": "1.2.6",

2
package.json
View file

@ -60,7 +60,7 @@
"jquery-ui-dist": "^1.12.1",
"jstimezonedetect": "^1.0.7",
"lodash": "^4.17.20",
"marked": "^1.1.1",
"marked": "^1.2.0",
"moment": "^2.29.0",
"moment-timezone": "^0.5.31",
"nextcloud-vue-collections": "^0.8.1",