upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge branch 'master' into dependabot/npm_and_yarn/marked-1.2.0

Browse source
This commit is contained in:
John Molakvoæ 2020-10-03 13:28:45 +02:00 committed by GitHub
commit 2eb64ee794
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/workflowengine/js/workflowengine.js
View file

File diff suppressed because one or more lines are too long

2
apps/workflowengine/js/workflowengine.js.map
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/files_client.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/files_client.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/files_fileinfo.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/files_fileinfo.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/files_iedavclient.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/files_iedavclient.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/install.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/install.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/login.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/login.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/main.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/main.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/maintenance.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/maintenance.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/recommendedapps.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/recommendedapps.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/unified-search.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/unified-search.js.map vendored
View file

File diff suppressed because one or more lines are too long

6
package-lock.json generated
View file

@ -6472,9 +6472,9 @@
}
},
"moment": {
"version": "2.27.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
"integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
"version": "2.29.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
"integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="
},
"moment-timezone": {
"version": "0.5.31",

2
package.json
View file

@ -61,7 +61,7 @@
"jstimezonedetect": "^1.0.7",
"lodash": "^4.17.20",
"marked": "^1.2.0",
"moment": "^2.27.0",
"moment": "^2.29.0",
"moment-timezone": "^0.5.31",
"nextcloud-vue-collections": "^0.8.1",
"p-limit": "^3.0.2",