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:
Laurent Lepinay
2015-04-20 10:16:54 +02:00
49 changed files with 103 additions and 5198 deletions

View File

@@ -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",