]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
authorIvan Khalopik <ikhalopik@gmail.com>
Mon, 27 May 2013 08:06:31 +0000 (11:06 +0300)
committerIvan Khalopik <ikhalopik@gmail.com>
Mon, 27 May 2013 08:06:31 +0000 (11:06 +0300)
commit3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc
tree5fa0a3d3556a83cd96147da46e90ae9f361d8efc
parent3c7a43a1f373d0c534476578b96a75ae2e63c985
parent7cbb1c0452a1d9904f7655aea78644def85b7f2e
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip

Conflicts:
js/bootstrap-collapse.js
js/collapse.js
js/tests/unit/collapse.js