Merge branch 'v4-dev' into v4-modal-footer-btns

74a516a9 · Mark Otto · 4b975969 · 6370e9dc · 74a516a9
Commit 74a516a9 authored 9 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 1 deletion
+1 -1
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,7 +28,7 @@ GEM
    mercenary (0.3.5)
    rake (10.5.0)
    rb-fsevent (0.9.7)
-    rb-inotify (0.9.6)
+    rb-inotify (0.9.7)
      ffi (>= 0.5.0)
    rouge (1.10.1)
    safe_yaml (1.0.4)