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
..
lib	Merge branch 'master' into unified-inbox	2016-01-25 17:28:29 -08:00
spec	Standardize message-list capitalization to AM/PM,	2016-01-19 15:54:44 -07:00
stylesheets	fix(message): Message time no longer selectable	2016-01-19 16:32:03 -08:00
.gitignore	fix(drafts): Various improvements and fixes to drafts, draft state management	2015-02-03 16:24:31 -08:00
package.json	fix(license): GPLv3 => GPL-3.0	2015-12-07 10:50:47 -08:00