Merge branch 'master' into next

Conflicts: source/getting-started/troubleshooting-configuration.markdown
2016-01-29 22:51:56 -08:00 · 2016-01-29 22:51:56 -08:00 · a4a1edf5bd
commit a4a1edf5bd
parent 7b935b1f1d b2b82d89ee
34 changed files with 241 additions and 90 deletions
--- a/source/_components/notify.pushbullet.markdown
+++ b/source/_components/notify.pushbullet.markdown
@ -48,7 +48,7 @@ If using targets, your own account's email address functions as 'send to all dev
  "message": "A message for many people",
  "target": [
    "device/telephone",
-    "contact/hello@example.com",
+    "email/hello@example.com",
    "channel/my_home"
  ]
 }