merge master fork

This commit is contained in:
hdpuk86
2019-10-24 21:17:23 +01:00
35 changed files with 317 additions and 37 deletions

View File

@@ -5,9 +5,15 @@
"requires": true,
"dependencies": {
"swagger-ui-dist": {
<<<<<<< HEAD
"version": "3.23.11",
"resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.23.11.tgz",
"integrity": "sha512-ipENHHH/sqpngTpHXUwg55eAOZ7b2UVayUwwuWPA6nQSPhjBVXX4zOPpNKUwQIFOl3oIwVvZF7mqoxH7pMgVzA=="
=======
"version": "3.18.2",
"resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.18.2.tgz",
"integrity": "sha512-pWAEiKkgWUJvjmLW9AojudnutJ+NTn5g6OdNLj1iIJWwCkoy40K3Upwa24DqFbmIE4vLX4XplND61hp2L+s5vg=="
>>>>>>> origin/master
}
}
}

View File

@@ -3,6 +3,10 @@
"version": "1.0.0",
"private": true,
"dependencies": {
<<<<<<< HEAD
"swagger-ui-dist": "3.23.11"
=======
"swagger-ui-dist": "3.18.2"
>>>>>>> origin/master
}
}