]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5a7af3 c9c2418)
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Mon, 29 Jul 2013 05:16:17 +0000 (22:16 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Mon, 29 Jul 2013 05:16:17 +0000 (22:16 -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