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
..
lib	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
stylesheets	fix(mail-rules): tiny CSS fix to "+" button in mail rules	2016-01-15 11:01:59 -08:00
package.json	fix(license): GPLv3 => GPL-3.0	2015-12-07 10:50:47 -08:00