Ben Gotow 13870fecd5 Merge branch 'master' into unified-inbox ... # Conflicts: # internal_packages/events/lib/event-header.cjsx # spec/stores/file-download-store-spec.coffee # spec/tasks/event-rsvp-spec.coffee # src/flux/tasks/event-rsvp.coffee		2016-01-12 08:20:55 -08:00
..
activity-sidebar-long-poll-store.coffee	fix(activity-sidebar): render correct copy on only correct moments	2015-09-22 14:05:26 -07:00
activity-sidebar.cjsx	feat(mail-rules): Per-account mail rules filter incoming, existing mail	2015-12-23 02:19:32 -05:00
initial-sync-activity.cjsx	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
main.cjsx	feat(plugins): Restore the plugins sidebar view	2015-10-03 18:11:36 -07:00
notifications-sticky-bar.cjsx	refactor(env): new NylasEnv global	2015-11-17 16:41:20 -08:00
notifications-store.coffee	fix(quoted-text): Fix + test case for Sentry 8323, body el is quoted text	2016-01-11 11:14:34 -08:00