]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Sun, 12 Jan 2014 03:13:10 +0000 (19:13 -0800)
committerMark Otto <otto@github.com>
Sun, 12 Jan 2014 03:13:10 +0000 (19:13 -0800)
commitbacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80
treedbeab5560ca6760fa65e9f342c517dcbe56475f9
parentea20f44815b535975d1f1416fee15bd1ea7acdb3
parent80c9c14ab956459f07a7f1de8693a2ab693bcb51
Merge branch 'master' into docs_derp

Conflicts:
docs/getting-started.html
docs/_includes/footer.html
docs/components.html
docs/css.html
docs/getting-started.html