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

..

backbone-min.js

merged from develop_2.0

2015-02-01 02:27:43 -08:00

handlebars-2.0.0.js

merged from develop_2.0

2015-02-01 02:27:43 -08:00

highlight.7.3.pack.js

Adding syntax highlight to JSON snippets and responses.

2012-11-15 18:13:33 -03:00

jquery-1.8.0.min.js

Normalize all the line endings

2015-03-17 14:34:22 -07:00

jquery.ba-bbq.min.js

updated to v2

2012-07-11 09:57:27 -07:00

jquery.slideto.min.js

updated to v2

2012-07-11 09:57:27 -07:00

jquery.wiggle.min.js

updated to v2

2012-07-11 09:57:27 -07:00

jsoneditor.min.js

JSON Editor feature

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

marked.js

merged from develop_2.0

2015-02-01 02:27:43 -08:00

shred.bundle.js

reverted files

2015-02-27 09:42:04 -08:00

swagger-client.js

Update swagger-js with latest

2015-03-11 14:17:11 -06:00

swagger-oauth.js

Append swagger-auth global functions to window and don't break backward

2015-03-16 15:07:14 -07:00

underscore-min.js

merged from develop_2.0

2015-02-01 02:27:43 -08:00

underscore-min.map

Add underscore source map file

2015-02-27 09:41:37 -08:00