Merge pull request #2604 from atom/jl-std-docs-4
authorJessica Lord <jessica.lord@github.com>
Mon, 31 Aug 2015 18:01:57 +0000 (11:01 -0700)
committerJessica Lord <jessica.lord@github.com>
Mon, 31 Aug 2015 18:01:57 +0000 (11:01 -0700)
Standardize: global-shortcuts, ipc (main), ipc (render)


Trivial merge