Merge branch 'master' into dev

2016-06-17 23:39:45 +09:00
parent 04839a630e 2b7dc1190e
commit 517cc16835
13 changed files with 172 additions and 50 deletions
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -122,6 +122,8 @@ The Settings Page is available from the **File** menu under **Settings** (Click
   - **Allow insecure contents**
      - If your team is hosted on `https://`, images with `http://` are not rendered by default.
        This option allows such images to be rendered, but please be careful for security.
+   - **Start app on login** (Windows, Linux)
+      - This option starts the application when you login.


 ## Menu Bar