]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'Synchro-master' into 2.0.3-wip
authorMark Otto <markotto@twitter.com>
Fri, 23 Mar 2012 00:10:16 +0000 (17:10 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 23 Mar 2012 00:10:16 +0000 (17:10 -0700)
commitfa1b3bdda479e4c419826e2e56fcddb90d6c3519
tree7e406fcbe9236f41d2102c241d435bba5b0e963b
parentd7af2714c66ce19ba63e0871837f35dac73ecf66
parent0e73a0e94b70eab01ca0cafbec48a892531304af
Merge branch 'Synchro-master' into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip
docs/javascript.html