diff options
| author | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
| commit | b5af762ef59e1fa97f4386f5feadb67aa5183fef (patch) | |
| tree | 3bcd0841e6938379e8c8ae7259ee16f27a49ea41 /js/bootstrap-popover.js | |
| parent | 7426ced0fb288a9e86f18da1849ad74f652d219a (diff) | |
| parent | 68cfedb34af198f178128f8c9bc8ea164e44304a (diff) | |
Merge branch '2.1.2-wip'v2.2.0
Conflicts:
js/bootstrap-dropdown.js
Diffstat (limited to 'js/bootstrap-popover.js')
| -rw-r--r-- | js/bootstrap-popover.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 941372285c..4535f07517 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-popover.js v2.1.1 + * bootstrap-popover.js v2.2.0 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. |