]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
projects / thirdparty / bootstrap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4fbb400 f5fd5e7)
Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component 3168/head
authorGiuliano Velli <wpbrains@giusi.org>
Tue, 24 Apr 2012 15:23:14 +0000 (17:23 +0200)
committerGiuliano Velli <wpbrains@giusi.org>
Tue, 24 Apr 2012 15:23:14 +0000 (17:23 +0200)
commit3aa89ded21bbf4b8b846edd2e9755a0e31c4b79b
treec837b75461b7a430347225dfd20bbc653472545btree
parent4fbb400754986b969b40fc12eacfd332ace1a174commit | diff
parentf5fd5e752329d92d3fde2e3f37f3406db62c400bcommit | diff
Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component

Conflicts:
docs/components.html

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
Mirror of https://github.com/twbs/bootstrap.git