]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2d4cf5 46a3320)
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorfat <jacobthornton@gmail.com>
Sat, 27 Jul 2013 03:34:59 +0000 (20:34 -0700)
committerfat <jacobthornton@gmail.com>
Sat, 27 Jul 2013 03:34:59 +0000 (20:34 -0700)
1  2 
assets/js/application.js patch | diff1 | diff2 | blob | history

diff --cc assets/js/application.js
Simple merge
Mirror of https://github.com/twbs/bootstrap.git