]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
authorMark Otto <otto@github.com>
Sat, 3 Aug 2013 03:19:20 +0000 (20:19 -0700)
committerMark Otto <otto@github.com>
Sat, 3 Aug 2013 03:19:20 +0000 (20:19 -0700)
commit4bac2c567a139958cb2ff35f7ad30c7dcd8527a3
tree15ff3959662ad861714d70529d7f5f233c5c5fe9
parenta0c44329e31f4ab3f1a5ea241074f0e7bd50a3f8
parent56aedcb71397c867396455b6860d627c1efe2707
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css