aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-17 23:39:28 -0800
committerMark Otto <[email protected]>2012-01-17 23:39:28 -0800
commit8c1a908754cac2d5760d433318f81471ad164330 (patch)
tree949dc35384431cd8f8f841d6f2d04e5a6d40a68d /docs/components.html
parent47b8184bbb5784eb373ffbb905c8a1756eba3c6d (diff)
parent4f1262760407f7a494c11dfbac83fbc837726510 (diff)
downloadbootstrap-8c1a908754cac2d5760d433318f81471ad164330.tar.xz
bootstrap-8c1a908754cac2d5760d433318f81471ad164330.zip
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs/components.html')
-rw-r--r--docs/components.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/components.html b/docs/components.html
index dd7f098b5..7d0593874 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1278,7 +1278,7 @@
</div>
<div class="span4">
<h3>Browser support</h3>
- <p>Progress bars use CSS3 gradients, transitions, and animations to achieve all theire effects. These features are not supported in IE7-8 or older versions of Firefox.</p>
+ <p>Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-8 or older versions of Firefox.</p>
<p>Opera does not support animations at this time.</p>
</div>
</div>