Merge branch 'master' into development

pivotal-cf · Nov 4, 2015 · da2408d · da2408d
2 parents 07c4e58 + b4be294
commit da2408d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CORE_TEAM_DOCS.md b/CORE_TEAM_DOCS.md
@@ -169,6 +169,8 @@ If you need an empty project to use that's all set up, check out the [pui-demo-p
 
   7. Go to the pivotal-ui working directory:  
   `$ cd pivotal-ui`
+  6. Switch to the development branch:  
+  `$ git co development`
   6. Start a Sinopia server (local NPM):  
   `$ sinopia .sinopia/config.yaml`
   5. Login with `test`,`test`:  

diff --git a/src/pivotal-ui/components/typography/package.json b/src/pivotal-ui/components/typography/package.json
@@ -1,8 +1,7 @@
 {
   "homepage": "http://styleguide.pivotal.io/",
   "dependencies": {
-    "pui-css-bootstrap": "2.1.0-alpha.1",
-    "font-awesome": "^4.4.0"
+    "pui-css-bootstrap": "2.1.0-alpha.1"
   },
   "version": "2.1.0-alpha.1"
 }