Merge remote-tracking branch 'swagger/develop_2.0' into JSONEditorMerge

Conflicts: dist/index.html dist/swagger-ui.js dist/swagger-ui.min.js src/main/html/index.html src/main/template/param.handlebars src/main/template/param_required.handlebars
2015-07-07 15:31:21 +02:00
parent 92efe421d0 59459a6086
commit d968fda207
50 changed files with 13078 additions and 1525 deletions
--- a/dist/lib/swagger-oauth.js
+++ b/dist/lib/swagger-oauth.js
@@ -281,4 +281,4 @@ window.onOAuthComplete = function onOAuthComplete(token) {
      }
    }
  }
-}
+}