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
(parent: 5cc933c) | patch

author	Mark Otto <mark.otto@twitter.com>
	Mon, 22 Aug 2011 03:47:24 +0000 (20:47 -0700)
committer	Mark Otto <mark.otto@twitter.com>
	Mon, 22 Aug 2011 03:47:24 +0000 (20:47 -0700)
commit	a98d2cccb8076b106e08e7ca76e59af013ab2851
tree	2ccfcdd3f3adf195ba49a80fe9a832bfaa2320a8	tree \| snapshot
parent	5cc933ccccfdc56b3cc0e440ea0022e43a1c3f84	commit \| diff

merge in master, resolve conflicts

bootstrap-1.0.0.css		diff \| blob \| blame \| history
bootstrap-1.0.0.min.css		diff \| blob \| blame \| history
docs/assets/css/docs.css		diff \| blob \| blame \| history
docs/assets/js/application.js		diff \| blob \| blame \| history
docs/index.html		diff \| blob \| blame \| history
lib/forms.less		diff \| blob \| blame \| history
lib/patterns.less		diff \| blob \| blame \| history
lib/preboot.less		diff \| blob \| blame \| history
lib/scaffolding.less		diff \| blob \| blame \| history
lib/tables.less		diff \| blob \| blame \| history

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