Merge master, update to Bootstrap 2.2.1

2012-11-01 09:28:34 -05:00
parent 85b0f59455 b843a0fee8
commit ac18e86fe8
22 changed files with 40 additions and 38 deletions
--- a/assets/css/less/bootstrap/bootstrap.less
+++ b/assets/css/less/bootstrap/bootstrap.less
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.2.0
+ * Bootstrap v2.2.1
 *
 * Copyright 2012 Twitter, Inc
 * Licensed under the Apache License v2.0
--- a/assets/css/less/bootstrap/responsive.less
+++ b/assets/css/less/bootstrap/responsive.less
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.2.0
+ * Bootstrap Responsive v2.2.1
 *
 * Copyright 2012 Twitter, Inc
 * Licensed under the Apache License v2.0
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.2.0
+ * Bootstrap v2.2.1
 *
 * Copyright 2012 Twitter, Inc
 * Licensed under the Apache License v2.0
@@ -5893,7 +5893,7 @@ a.badge:hover {
 }

 /*!
- * Bootstrap Responsive v2.2.0
+ * Bootstrap Responsive v2.2.1
 *
 * Copyright 2012 Twitter, Inc
 * Licensed under the Apache License v2.0
--- a/assets/css/main.min.css
+++ b/assets/css/main.min.css