]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41c7825 b352f98)
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
authorIvan Khalopik <ikhalopik@gmail.com>
Tue, 7 May 2013 12:16:45 +0000 (15:16 +0300)
committerIvan Khalopik <ikhalopik@gmail.com>
Tue, 7 May 2013 12:16:45 +0000 (15:16 +0300)
Conflicts:
js/tests/unit/bootstrap-collapse.js

1  2 
js/bootstrap-collapse.js patch | diff1 | diff2 | blob | history

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