Merge branch 'master' into next

Conflicts:
	assets/stylesheets/bootstrap/_variables.scss
	lib/bootstrap-sass/version.rb
	test/test_helper.rb

3 files changed, 2 insertions, 3 deletions

diff --git a/assets/images/.keep b/assets/images/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/assets/images/.keep
diff --git a/assets/stylesheets/bootstrap/_list-group.scss b/assets/stylesheets/bootstrap/_list-group.scss
index 49c64eb..36c297c 100644
--- a/assets/stylesheets/bootstrap/_list-group.scss
+++ b/assets/stylesheets/bootstrap/_list-group.scss
@@ -74,8 +74,7 @@ a.list-group-item {
   &.disabled:focus {
     background-color: $list-group-disabled-bg;
     color: $list-group-disabled-color;
-    cursor: not-allowed;
-    
+
     // Force color to inherit for custom content
     .list-group-item-heading {
       color: inherit;
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss
index 7fb9ff0..a424736 100644
--- a/assets/stylesheets/bootstrap/_variables.scss
+++ b/assets/stylesheets/bootstrap/_variables.scss
@@ -1,4 +1,4 @@
-// When true, asset path helpers are used, otherwise regular `url()`` is used.
+// When true, asset path helpers are used, otherwise the regular CSS `url()` is used.
 // When there no function is defined, `fn('')` is parsed as string that equals the right hand side
 // NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path)
 $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;