Merge branch 'master' of https://github.com/sagiegurari/angular-web-notification

sagiegurari · sagiegurari · commit 2c2f81f5b487 · 2015-02-16T19:16:22.000+02:00
Conflicts:
	README.md
	bower.json
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 bower_components
 node_modules
+npm-debug.log
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ See full docs at: [API Docs](docs/api.md)
 
 ## Release History
 
- * 2015-02-16   v0.0.6   Automatic unit tests via karma
+ * 2015-02-16   v0.0.7   Automatic unit tests via karma
  * 2015-02-05   v0.0.5   Doc changes
  * 2014-12-30   v0.0.4   Doc changes
  * 2014-12-09   v0.0.3   API now enables/disables the capability to automatically request for permissions needed to display the notification.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-web-notification",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "authors": [
     "Sagie Gur-Ari <sgurari@yahoo.com>"
   ],

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-web-notification",`
`3`		`- "version": "0.0.6",`
	`3`	`+ "version": "0.0.7",`
`4`	`4`	`"authors": [`
`5`	`5`	`"Sagie Gur-Ari <[email protected]>"`
`6`	`6`	`],`