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-contact-field.cjsx	feat(account-prefs): Adds new page for Account in preferences	2015-12-10 15:27:29 -08:00
collapsed-participants.cjsx
compose-button.cjsx
composer-editor.jsx	refactor(toolbar): allow toolbar extensions in contenteditable	2016-01-20 14:35:20 -08:00
composer-view.cjsx	Merge branch 'master' into unified-inbox	2016-01-25 17:28:29 -08:00
expanded-participants.cjsx	feat(account-prefs): Adds new page for Account in preferences	2015-12-10 15:27:29 -08:00
fields.cjsx
file-upload.cjsx
image-file-upload.cjsx	fix(uploads): Don't allow dragging of uploading images (Fixes #366)	2015-12-29 14:21:42 -08:00
main.cjsx
participants-text-field.cjsx
send-action-button.cjsx	feat(send): Send and Archive	2016-01-25 14:14:09 -08:00