Ben Gotow e2234bf58e 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
..
draft-buttons.cjsx
draft-list-columns.cjsx
draft-list-store.coffee
draft-list.cjsx
draft-selection-bar.cjsx
empty-state.cjsx
focus-container.cjsx
formatting-utils.cjsx
main.cjsx
thread-buttons.cjsx
thread-list-columns.cjsx
thread-list-data-source.coffee
thread-list-icon.cjsx
thread-list-participants.cjsx
thread-list-quick-actions.cjsx
thread-list-scroll-tooltip.cjsx
thread-list-store.coffee
thread-list.cjsx	Merge branch 'master' into unified-inbox	2016-01-25 17:28:29 -08:00
thread-selection-bar.cjsx