Merge branch 'master' into pr/10951

Conflicts:
	dist/css/bootstrap.min.css
	less/modals.less

1 files changed, 6 insertions, 6 deletions

diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js
index 06219a1c8..8ebf3dcdf 100644
--- a/js/tests/unit/scrollspy.js
+++ b/js/tests/unit/scrollspy.js
@@ -1,25 +1,25 @@
 $(function () {
 
-    module("scrollspy")
+    module('scrollspy')
 
-      test("should provide no conflict", function () {
+      test('should provide no conflict', function () {
         var scrollspy = $.fn.scrollspy.noConflict()
         ok(!$.fn.scrollspy, 'scrollspy was set back to undefined (org value)')
         $.fn.scrollspy = scrollspy
       })
 
-      test("should be defined on jquery object", function () {
+      test('should be defined on jquery object', function () {
         ok($(document.body).scrollspy, 'scrollspy method is defined')
       })
 
-      test("should return element", function () {
+      test('should return element', function () {
         ok($(document.body).scrollspy()[0] == document.body, 'document.body returned')
       })
 
-      test("should switch active class on scroll", function () {
+      test('should switch active class on scroll', function () {
         var sectionHTML = '<div id="masthead"></div>'
           , $section = $(sectionHTML).append('#qunit-fixture')
-          , topbarHTML ='<div class="topbar">'
+          , topbarHTML = '<div class="topbar">'
           + '<div class="topbar-inner">'
           + '<div class="container">'
           + '<h3><a href="#">Bootstrap</a></h3>'