Laurent Lepinay 57055ffc18 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

..

html

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

2015-10-29 10:48:42 +01:00

javascript

don't override title and type if they are already defined

2015-10-05 13:36:52 +02:00

less

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

2015-09-21 14:48:29 +02:00

template

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

2015-10-29 10:48:42 +01:00