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	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
spec	feat(tasks): add Create, Update, Destroy tasks plus spec & lint fixes	2016-01-15 15:16:21 -05:00
package.json	fix(license): GPLv3 => GPL-3.0	2015-12-07 10:50:47 -08:00