Merge remote-tracking branch 'upstream/develop_2.0' into JSONEditor

Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
This commit is contained in:
Laurent Lepinay
2015-04-20 10:16:54 +02:00
49 changed files with 103 additions and 5198 deletions

View File

@@ -1 +0,0 @@
(function(b){b.fn.slideto=function(a){a=b.extend({slide_duration:"slow",highlight_duration:3E3,highlight:true,highlight_color:"#FFFF99"},a);return this.each(function(){obj=b(this);b("body").animate({scrollTop:obj.offset().top},a.slide_duration,function(){a.highlight&&b.ui.version&&obj.effect("highlight",{color:a.highlight_color},a.highlight_duration)})})}})(jQuery);