]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
authorfat <jacobthornton@gmail.com>
Wed, 6 Feb 2013 06:30:54 +0000 (22:30 -0800)
committerfat <jacobthornton@gmail.com>
Wed, 6 Feb 2013 06:30:54 +0000 (22:30 -0800)
commit3b56227553f40cc567e161c68c64f1e315fd5241
tree0ecd914f0c395b277dc46300733d8bc05ab4802e
parent481428154084a9fafd31d8654157d6f6f78231d0
parentaccfdaafdbfc172f4d8358bbab820a9862bd8eb9
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
js/bootstrap-tooltip.js