]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Sun, 9 Mar 2014 23:11:04 +0000 (16:11 -0700)
committerMark Otto <otto@github.com>
Sun, 9 Mar 2014 23:11:04 +0000 (16:11 -0700)
commitb263a0197be84f4018c124b738e07e35c42d493f
treec689aa917b65ee0ce661e52dc6388aab7e27a64a
parent2f7b04a192f271f63e83db9e2e6322b63abff252
parent68b3e3f3be1d326474a7f3d2fbc82f349f7815fc
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
Gruntfile.js
Gruntfile.js