Merge branch 'master' into felix-notification-docs

2017-05-01 15:56:14 -07:00 · 2017-05-01 15:56:14 -07:00 · 9fd1e2c8c4
commit 9fd1e2c8c4
parent d5c4ad5e2c 98d17d64ef
243 changed files with 6040 additions and 1835 deletions
--- a/docs/tutorial/desktop-environment-integration.md
+++ b/docs/tutorial/desktop-environment-integration.md
@ -8,6 +8,10 @@ applications can put a custom menu in the dock menu.
 This guide explains how to integrate your application into those desktop
 environments with Electron APIs.

+## Notifications
+
+See [Notifications](notifications.md)
+
 ## Recent documents (Windows & macOS)

 Windows and macOS provide easy access to a list of recent documents opened by