2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'master' into 3.0.0-wip

Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
Mark Otto
2013-02-07 22:18:53 -08:00
12 changed files with 71 additions and 33 deletions
+1 -1
View File
@@ -245,7 +245,7 @@
, fixTitle: function () {
var $e = this.$element
if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
$e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
$e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
}
}