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

@@ -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
}
}