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: 532e4ba a40568a)

author	Mark Otto <otto@github.com>
	Fri, 6 Sep 2013 16:23:49 +0000 (09:23 -0700)
committer	Mark Otto <otto@github.com>
	Fri, 6 Sep 2013 16:23:49 +0000 (09:23 -0700)
commit	5c4c7eba54b27711bd7edf411417122cb154e787
tree	f87ad191027fa2ff5fd4828b6b35cfa5ec37a8fa	tree
parent	532e4bab582bec779e9e0e5a9c79cb59ac81e539	commit \| diff
parent	a40568a1e01b864c8ef813a672abd790bf902a83	commit \| diff

Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master

Conflicts:
dist/css/bootstrap.min.css

dist/css/bootstrap.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.min.css	diff1 \|	diff2 \|	blob \| history
less/carousel.less	diff1 \|	diff2 \|	blob \| history

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