Merge remote-tracking branch 'upstream/develop_2.0' into JSONEditor
Conflicts: dist/swagger-ui.js dist/swagger-ui.min.js
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
"contact": {
|
||||
"url": "http://swagger.io",
|
||||
"name": "Your pals at Swagger",
|
||||
"email": "apiteam@wordnik.com"
|
||||
"email": "apiteam@swagger.io"
|
||||
},
|
||||
"license": {
|
||||
"name": "Apache 2.0",
|
||||
|
||||
Reference in New Issue
Block a user