Merge branch 'master' into master

zvonimirfras · web-flow · commit f6d4b57e00e1 · 2018-09-04T14:45:00.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -32,3 +32,5 @@ deploy:
     skip_cleanup: true
     true:
       branch: master
+notifications:
+  email: false
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Carbon Components Angular
+# Carbon Components Angular [![npm](https://img.shields.io/npm/v/carbon-components-angular.svg)](https://www.npmjs.com/package/carbon-components-angular) [![Travis](https://travis-ci.com/IBM/carbon-components-angular.svg?branch=master)](https://travis-ci.com/IBM/carbon-components-angular)
 An _Angular_ implementation of the Carbon Design System
 
 ### Getting started
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "type": "git",
     "url": "git@github.com:IBM/carbon-components-angular.git"
   },
-  "license": "Apache-2",
+  "license": "Apache-2.0",
   "author": "IBM",
   "peerDependencies": {
     "@angular/animations": "^6.1.0",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Carbon Components Angular`
	`1`	`+# Carbon Components Angular [![npm](https://img.shields.io/npm/v/carbon-components-angular.svg)](https://www.npmjs.com/package/carbon-components-angular) [![Travis](https://travis-ci.com/IBM/carbon-components-angular.svg?branch=master)](https://travis-ci.com/IBM/carbon-components-angular)`
`2`	`2`	`An _Angular_ implementation of the Carbon Design System`
`3`	`3`
`4`	`4`	`### Getting started`