From 0cf417ae6e17561c98088131d877ec4ddc32d0c3 Mon Sep 17 00:00:00 2001
From: electblake <electblake@gmail.com>
Date: Sat, 16 Mar 2013 01:49:22 -0400
Subject: initial commi for composer.json

---
 composer.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 composer.json

diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..632ac273
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,14 @@
+{
+    "name": "thomaspark/bootswatch",
+    "description": "Themes for Twitter Bootstrap",
+    "license": "Apache",
+    "authors": [
+        {
+            "name": "thomaspark",
+            "email": "hello@thomaspark.me"
+        }
+    ],
+    "require": {
+
+    }
+}
-- 
cgit v1.2.3


From 83b89c00cee9f625f10e599ff6b83a61f752efa9 Mon Sep 17 00:00:00 2001
From: electblake <electblake@gmail.com>
Date: Sat, 16 Mar 2013 02:00:43 -0400
Subject: Added bootstrap requirement and branch-alias

---
 composer.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 632ac273..0e1a3950 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,11 @@
         }
     ],
     "require": {
-
+        "slywalker/twitter_bootstrap": "dev-master"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "gh-pages"
+        }
     }
 }
-- 
cgit v1.2.3


From d99be7b24d5850c096dfed02806bdb7d41adc5aa Mon Sep 17 00:00:00 2001
From: electblake <electblake@gmail.com>
Date: Sat, 16 Mar 2013 02:04:20 -0400
Subject: removed the alias

---
 composer.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/composer.json b/composer.json
index 0e1a3950..29674f7d 100644
--- a/composer.json
+++ b/composer.json
@@ -10,10 +10,5 @@
     ],
     "require": {
         "slywalker/twitter_bootstrap": "dev-master"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "gh-pages"
-        }
     }
 }
-- 
cgit v1.2.3


From 347e229d70b1b9b0d6ca9f2f0fbe6b520926a09c Mon Sep 17 00:00:00 2001
From: electblake <electblake@gmail.com>
Date: Sat, 16 Mar 2013 02:28:12 -0400
Subject: fixed license name, and removed cake-plugin for twitter npm provides
 what we need

---
 composer.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 29674f7d..6d32a84b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,14 +1,11 @@
 {
     "name": "thomaspark/bootswatch",
     "description": "Themes for Twitter Bootstrap",
-    "license": "Apache",
+    "licenses": "Apache-2.0",
     "authors": [
         {
             "name": "thomaspark",
             "email": "hello@thomaspark.me"
         }
-    ],
-    "require": {
-        "slywalker/twitter_bootstrap": "dev-master"
-    }
+    ]
 }
-- 
cgit v1.2.3