git.ipfire.org Git - thirdparty/bootstrap.git/commit

]> git.ipfire.org Git - thirdparty/bootstrap.git/commit

author	Mark Otto <markdotto@gmail.com>
	Sun, 11 Dec 2011 08:58:10 +0000 (00:58 -0800)
committer	Mark Otto <markdotto@gmail.com>
	Sun, 11 Dec 2011 08:58:10 +0000 (00:58 -0800)
commit	6de3ed53228c79bc4fde5086d1302f2367bc40a5
tree	d3dfa15bd3a458747048e43d685e1af275de1db0	tree \| snapshot
parent	200fe25d0a3b5391ecfd8385142bfdbd318f747c	commit \| diff
parent	6e70d490e1c189518164d7f08035c34e21745715	commit \| diff

Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider

Conflicts:
bootstrap.css

Mirror of https://github.com/twbs/bootstrap.git