laurent lepinay e7b7465335 Merge branch 'develop_2.0' into JSONEditor ...

Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/coffeescript/view/MainView.coffee
	src/main/coffeescript/view/OperationView.coffee
	src/main/coffeescript/view/ParameterView.coffee
	src/main/coffeescript/view/ResourceView.coffee
	src/main/coffeescript/view/SignatureView.coffee
	src/main/html/index.html

2015-03-24 07:06:07 -07:00

5.6 KiB

Raw History

View Raw