Merge branch 'v4-dev' into floating-label-input-height

twbs · Aug 25, 2018 · 9490095 · 9490095
2 parents 3497780 + 8073e10
commit 9490095
Show file tree

Hide file tree

Showing 42 changed files with 1,466 additions and 457 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -53,11 +53,11 @@ GEM
       mini_portile2 (~> 2.3.0)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rouge (3.2.0)
+    rouge (3.2.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     sass (3.5.7)