]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
authorMark Otto <otto@github.com>
Sun, 18 Aug 2013 09:04:10 +0000 (02:04 -0700)
committerMark Otto <otto@github.com>
Sun, 18 Aug 2013 09:04:10 +0000 (02:04 -0700)

Trivial merge