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
..
assets	fix(empty-states): Use quotes sparingly, show generic empty text in three-column mode and during search	2015-06-17 13:14:45 -07:00
lib	Merge branch 'master' into unified-inbox	2016-01-25 17:28:29 -08:00
spec	Fix ThreadListParticipants spec	2016-01-11 13:31:35 -08:00
stylesheets	Show the important icon whenever any account in the perspective supports it	2016-01-19 00:00:08 -08:00
package.json	fix(license): GPLv3 => GPL-3.0	2015-12-07 10:50:47 -08:00