Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

Conflicts: dist/swagger-ui.js dist/swagger-ui.min.js
2015-10-29 10:48:42 +01:00
parent c269dbd9ed 2fced78075
commit 57055ffc18
11 changed files with 137 additions and 18 deletions
--- a/dist/index.html
+++ b/dist/index.html
@@ -50,7 +50,7 @@
          if(typeof initOAuth == "function") {
            initOAuth({
              clientId: "your-client-id",
-              clientSecret: "your-client-secret",
+              clientSecret: "your-client-secret-if-required",
              realm: "your-realms",
              appName: "your-app-name", 
              scopeSeparator: ","