]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a8d757 9ebc6b4)
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
authorJacob Thornton <jacobthornton@gmail.com>
Sat, 10 Mar 2012 20:42:39 +0000 (12:42 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Sat, 10 Mar 2012 20:42:39 +0000 (12:42 -0800)
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css

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

diff --cc docs/assets/bootstrap.zip
index 502139c251c28bc4a5776ad41c7565c1db63c020,086c8db2934d37456bb357e2851d92532a0fbfbb..808f3ff19c17c15f346c5464774d228b3b8135d1
Binary files differ
diff --cc docs/assets/css/bootstrap.css
Simple merge
Mirror of https://github.com/twbs/bootstrap.git