Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-03-03 04:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of github.com:wekan/wekan

Browse source
This commit is contained in:
Lauri Ojansivu 2021-08-11 22:07:23 +03:00
commit 855d60f28e
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
package-lock.json generated
View file

@ -22,9 +22,15 @@
"exceljs": "^4.2.1", "exceljs": "^4.2.1",
"fibers": "^5.0.0", "fibers": "^5.0.0",
"gridfs-stream": "https://github.com/wekan/gridfs-stream/tarball/master", "gridfs-stream": "https://github.com/wekan/gridfs-stream/tarball/master",
<<<<<<< HEAD
"jszip": "^3.7.1", "jszip": "^3.7.1",
"ldapjs": "^2.3.1", "ldapjs": "^2.3.1",
"markdown-it": "^12.2.0", "markdown-it": "^12.2.0",
=======
"jszip": "^3.7.0",
"ldapjs": "^2.3.0",
"markdown-it": "^12.1.0",
>>>>>>> e23ced47ae40e055e23506ea9c836b768a8f68c9
"markdown-it-emoji": "^2.0.0", "markdown-it-emoji": "^2.0.0",
"meteor-node-stubs": "^1.1.0", "meteor-node-stubs": "^1.1.0",
"mongodb": "^3.6.11", "mongodb": "^3.6.11",
@ -1955,9 +1961,15 @@
} }
}, },
"node_modules/jszip": { "node_modules/jszip": {
<<<<<<< HEAD
"version": "3.7.1", "version": "3.7.1",
"resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz", "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
"integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==", "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
=======
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz",
"integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==",
>>>>>>> e23ced47ae40e055e23506ea9c836b768a8f68c9
"dependencies": { "dependencies": {
"lie": "~3.3.0", "lie": "~3.3.0",
"pako": "~1.0.2", "pako": "~1.0.2",
@ -8505,9 +8517,15 @@
} }
}, },
"jszip": { "jszip": {
<<<<<<< HEAD
"version": "3.7.1", "version": "3.7.1",
"resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz", "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
"integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==", "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
=======
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz",
"integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==",
>>>>>>> e23ced47ae40e055e23506ea9c836b768a8f68c9
"requires": { "requires": {
"lie": "~3.3.0", "lie": "~3.3.0",
"pako": "~1.0.2", "pako": "~1.0.2",

6
package.json
View file

@ -34,9 +34,15 @@
"exceljs": "^4.2.1", "exceljs": "^4.2.1",
"fibers": "^5.0.0", "fibers": "^5.0.0",
"gridfs-stream": "https://github.com/wekan/gridfs-stream/tarball/master", "gridfs-stream": "https://github.com/wekan/gridfs-stream/tarball/master",
<<<<<<< HEAD
"jszip": "^3.7.1", "jszip": "^3.7.1",
"ldapjs": "^2.3.1", "ldapjs": "^2.3.1",
"markdown-it": "^12.2.0", "markdown-it": "^12.2.0",
=======
"jszip": "^3.7.0",
"ldapjs": "^2.3.0",
"markdown-it": "^12.1.0",
>>>>>>> e23ced47ae40e055e23506ea9c836b768a8f68c9
"markdown-it-emoji": "^2.0.0", "markdown-it-emoji": "^2.0.0",
"meteor-node-stubs": "^1.1.0", "meteor-node-stubs": "^1.1.0",
"mongodb": "^3.6.11", "mongodb": "^3.6.11",