]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11868
authorMark Otto <otto@github.com>
Sat, 14 Dec 2013 19:36:54 +0000 (11:36 -0800)
committerMark Otto <otto@github.com>
Sat, 14 Dec 2013 19:36:54 +0000 (11:36 -0800)
commitecc6f4e6bc00b16fe3316d51d54aebe98b07aa0d
treee7429fe6af607fa673fe6f5d0fac59ccd66ef99e
parent37b2c8a812337a6ed9324ba2e5dab9afbc5ad3ce
parent22820d7151fa155a4e083bf6c940a52e55138735
Merge branch 'master' into pr/11868

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