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

Conflicts: dist/swagger-ui.js dist/swagger-ui.min.js test/e2e/v2.js
2015-09-21 14:48:29 +02:00
parent 1a8444c4c0 8bc259558b
commit 1367e8f6fa
12 changed files with 137 additions and 8 deletions
--- a/src/main/less/specs.less
+++ b/src/main/less/specs.less
@@ -757,6 +757,9 @@
                                        outline: 2px solid black;
                                        outline-color: #cc0000;
                                    }
+                                    select[name='parameterContentType'] {
+                                        max-width:300px;
+                                    }
                                }
                                div.response {
                                    div.block {
@@ -1117,4 +1120,4 @@
    }
 }

-}
+}