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
activity-sidebar.cjsx
initial-sync-activity.cjsx
main.cjsx
notifications-sticky-bar.cjsx
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