summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelectblake <electblake@gmail.com>2013-03-16 02:00:43 -0400
committerelectblake <electblake@gmail.com>2013-03-16 02:00:43 -0400
commit83b89c00cee9f625f10e599ff6b83a61f752efa9 (patch)
treefe51986a9396ee8d376de64b96757145dce04fe7
parent0cf417ae6e17561c98088131d877ec4ddc32d0c3 (diff)
Added bootstrap requirement and branch-alias
-rw-r--r--composer.json7
1 files changed, 6 insertions, 1 deletions
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"
+ }
}
}