0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

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

This commit is contained in:
Mark Otto 2016-02-08 23:32:12 -08:00
commit 74a516a9b1

View File

@ -28,7 +28,7 @@ GEM
mercenary (0.3.5) mercenary (0.3.5)
rake (10.5.0) rake (10.5.0)
rb-fsevent (0.9.7) rb-fsevent (0.9.7)
rb-inotify (0.9.6) rb-inotify (0.9.7)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rouge (1.10.1) rouge (1.10.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)