Merge remote-tracking branch 'origin/v2'

ResponsiveBP · Apr 15, 2014 · bd31782 · bd31782
2 parents 39d4ddd + 3334256
commit bd31782
Show file tree

Hide file tree

Showing 26 changed files with 559 additions and 559 deletions.
diff --git a/.gitignore b/.gitignore
@@ -218,3 +218,4 @@ pip-log.txt
 node_modules/
 
 dist/vendor/
+_site/
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "responsive",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "homepage": "http://responsivebp.com",
   "authors": [
     "James South"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -218,3 +218,4 @@ pip-log.txt
		node_modules/

		dist/vendor/
		_site/