]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
docs/components.html

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>

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