]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b40ee6 181b276)
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorfat <jacobthornton@gmail.com>
Thu, 18 Jul 2013 08:08:19 +0000 (01:08 -0700)
committerfat <jacobthornton@gmail.com>
Thu, 18 Jul 2013 08:08:19 +0000 (01:08 -0700)
Conflicts:
docs/assets/js/bootstrap.min.js

1  2 
docs/assets/css/bootstrap.css patch | diff1 | diff2 | blob | history
docs/javascript.html patch | diff1 | diff2 | blob | history

diff --cc docs/assets/css/bootstrap.css
Simple merge
diff --cc docs/javascript.html
Simple merge
Mirror of https://github.com/twbs/bootstrap.git