From: Francesco Pontillo <francescopontillo@gmail.com>
Date: Tue, 26 Feb 2013 00:12:31 +0000 (+0100)
Subject: Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
X-Git-Tag: v2.3.0+2~7^2~6
X-Git-Url: http://git.roojs.org/?p=bootswatch;a=commitdiff_plain;h=bbd50186cdfbc18ac2a236f3d162d95f8c514301

Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

Conflicts:
	component.json
---

bbd50186cdfbc18ac2a236f3d162d95f8c514301
diff --cc component.json
index 9ab1fc7,cf50b43..af46e49
--- a/component.json
+++ b/component.json
@@@ -1,15 -1,16 +1,21 @@@
  {
-   "author": "Thomas Park",
-   "name": "bootswatch",
-   "description": "Bootswatch is a collection of free themes for Twitter Bootstrap.",
-   "version": "2.3.0+1",
-   "homepage": "http://bootswatch.com/",
-   "repository": {
-     "type": "git",
-     "url": "git://github.com/thomaspark/bootswatch.git"
-   },
-   "main": "",
-   "dependencies": {
-     "bootstrap": "~2.3.0"
-   }
+ 	"name": "bootswatch",
+ 	"description": "Themes for Bootstrap",
+ 	"homepage": "http://bootswatch.com",
+ 	"author": "Thomas Park",
 -	"version": "v2.3.0+1",
++	"version": "2.3.0+1",
++	"repository": {
++		"type": "git",
++		"url": "git://github.com/thomaspark/bootswatch.git"
++	},
+ 	"dependencies": {
 -		"jquery": "~1.9.0"
++		"jquery": "~1.9.0",
++		"bootstrap": "~2.3.0"
+ 	},
+ 	"licenses": [
+ 		{
+ 			"type": "Apache-2.0",
+ 			"url": "http://www.apache.org/licenses/LICENSE-2.0"
+ 		}
+ 	]
  }