diff options
| author | Mark Otto <[email protected]> | 2016-02-08 23:32:12 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-08 23:32:12 -0800 |
| commit | 74a516a9b10affa77e17344753d7aba94e260170 (patch) | |
| tree | c93471e14c12eaa371347b988b0db773670da339 | |
| parent | 4b97596982dbbf0cc713c6e92f8a8f9503882385 (diff) | |
| parent | 6370e9dc7594a084574058b146c55f08b6d6c6f8 (diff) | |
| download | bootstrap-74a516a9b10affa77e17344753d7aba94e260170.tar.xz bootstrap-74a516a9b10affa77e17344753d7aba94e260170.zip | |
Merge branch 'v4-dev' into v4-modal-footer-btns
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8a381d810..3391e7f48 100644 --- 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) |