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

..

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

fix jsoneditor render when nested object type is not defined

2015-09-21 15:11:50 +02:00

marked.js

merged from develop_2.0

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

swagger-oauth.js

Merge pull request #1682 from lucian303/oauth-client-secret

2015-10-26 16:24:31 -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