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
..
plugins
email-frame-styles-store.coffee
email-frame.cjsx
main.cjsx
message-controls.cjsx	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
message-item-body.cjsx
message-item-container.cjsx
message-item.cjsx	fix(message): Message time no longer selectable	2016-01-19 16:32:03 -08:00
message-list.cjsx	More database-related spec fixes	2016-01-25 11:35:23 -08:00
message-participants.cjsx
message-timestamp.cjsx	Standardize message-list capitalization to AM/PM,	2016-01-19 15:54:44 -07:00
message-toolbar-items.cjsx
sidebar-components.cjsx
thread-archive-button.cjsx	TaskFactory now returns N tasks for performing standard actions, undo uses arrays	2016-01-21 13:46:04 -08:00
thread-star-button.cjsx
thread-toggle-unread-button.cjsx
thread-trash-button.cjsx	TaskFactory now returns N tasks for performing standard actions, undo uses arrays	2016-01-21 13:46:04 -08:00