Ben Gotow 3a8a38b8bc Merge branch 'master' into unified-inbox ... # Conflicts: # spec/stores/file-download-store-spec.coffee		2016-01-13 17:20:34 -08:00
..
linux	build(linux): Ensure that target files are not group writable	2016-01-13 16:09:53 -08:00
mac	fix(name): "Nylas" => "Nylas N1" on Mac, Linux	2015-10-03 22:34:58 -07:00
nylas@2edb5e49ee	Bump submodule reference	2016-01-11 16:21:05 -08:00
ssh	feat(ci): add Travis and AppVeyor ci support	2015-12-07 12:48:26 -05:00
win	refactor(env): new NylasEnv global	2015-11-17 16:41:20 -08:00
nylas.png	feat(icon): Finalized icon	2015-10-03 21:16:14 -07:00