Merge branch '1.1.1-wip'

This commit is contained in:
Jacob Thornton 2011-08-26 15:21:20 -07:00
commit a63fb4d234
15 changed files with 1190 additions and 833 deletions

View file

@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.1.0.css" rel="stylesheet">
<link href="../bootstrap-1.1.1.css" rel="stylesheet">
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">