]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into table-nesting 10232/head
authorMark Otto <otto@github.com>
Sun, 1 Sep 2013 07:59:27 +0000 (09:59 +0200)
committerMark Otto <otto@github.com>
Sun, 1 Sep 2013 07:59:27 +0000 (09:59 +0200)
commit560753da969a38049a667aefe2ae10a6c61f4386
treec74462578517e83edec9f250c759d7c10a3e7279
parent901da1b2b4727e3d00990dcf66ea3d31703b4edc
parent4b53ea52e9cc27ab27dde2695400fd6c95a0b6c2
Merge branch 'master' into table-nesting

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