Commit Graph

4 Commits

Author SHA1 Message Date
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
Tony Tam
8a9d41ca27 added dist folder back now that git downloads are gone 2013-01-25 20:15:23 -08:00
Tony Tam
c7788bd77f removed dist folder 2012-08-18 22:22:01 -07:00
Tony Tam
5f2e11117c added pre-built distro 2012-07-13 06:17:37 -07:00