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

Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
This commit is contained in:
Laurent Lepinay
2015-10-29 10:48:42 +01:00
11 changed files with 137 additions and 18 deletions

View File

@@ -92,7 +92,7 @@
{{/if}}
</form>
<div class='response' style='display:none'>
<h4>Curl</h4>
<h4 class='curl'>Curl</h4>
<div class='block curl'></div>
<h4 data-sw-translate>Request URL</h4>
<div class='block request_url'></div>