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

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

projects / thirdparty / bootstrap.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5e31478 04a73eb)

author	Mark Otto <otto@github.com>
	Sun, 18 Aug 2013 05:39:07 +0000 (22:39 -0700)
committer	Mark Otto <otto@github.com>
	Sun, 18 Aug 2013 05:39:07 +0000 (22:39 -0700)
commit	18766db63423e9151d1be4de061016b7a53ff8a1
tree	07c1170429e6e22caba90d72948460f379d989e3	tree \| snapshot
parent	5e31478a91e62fc022ba0141acf27937c9dd7719	commit \| diff
parent	04a73ebe42b8beb9567220fe31cc11057badf40f	commit \| diff

Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
dist/css/bootstrap.min.css

assets/css/docs.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.min.css	diff1 \|	diff2 \|	blob \| history
getting-started.html	diff1 \|	diff2 \|	blob \| history
less/navbar.less	diff1 \|	diff2 \|	blob \| history

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