Ben Gotow 0ef4911b22 Merge branch 'master' into unified-inbox ... # Conflicts: # internal_packages/feedback/lib/feedback-button.cjsx # internal_packages/thread-list/lib/thread-list.cjsx # src/flux/stores/draft-store.coffee		2016-01-25 17:28:29 -08:00
..
account-choose-page.cjsx	fix(auth): Track authentication success / failure rates by provider	2015-12-08 16:39:38 -08:00
account-settings-page.cjsx	fix(onboarding): Minor style changes, headers for EAS	2016-01-20 17:09:15 -08:00
account-types.coffee	fix(onboarding): Minor style changes, headers for EAS	2016-01-20 17:09:15 -08:00
initial-packages-page.cjsx	feat(newsletter): Manage subscription directly from N1	2016-01-07 18:44:40 -08:00
initial-preferences-page.cjsx	feat(newsletter): Manage subscription directly from N1	2016-01-07 18:44:40 -08:00
main.cjsx	refactor(env): new NylasEnv global	2015-11-17 16:41:20 -08:00
nylas-api-environment-store.coffee	refactor(env): new NylasEnv global	2015-11-17 16:41:20 -08:00
onboarding-actions.coffee	fix(onboarding): Invitation code system, just in case	2015-10-04 16:49:41 -07:00
page-router-store.coffee	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
page-router.cjsx	refactor(env): new NylasEnv global	2015-11-17 16:41:20 -08:00
token-auth-api.coffee	refactor(env): new NylasEnv global	2015-11-17 16:41:20 -08:00
token-auth-page.cjsx	refactor(env): new NylasEnv global	2015-11-17 16:41:20 -08:00
welcome-page.cjsx	bump(electron): 0.34.3 => 0.35.1	2015-11-23 22:09:17 -08:00