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(onboarding): Replace ❤️ with a heart image for win32	2015-10-23 11:42:55 -07:00
lib	Merge branch 'master' into unified-inbox	2016-01-25 17:28:29 -08:00
spec	refactor(env): new NylasEnv global	2015-11-17 16:41:20 -08:00
stylesheets	fix(onboarding): fix add account button width	2015-10-23 15:21:58 -07:00
package.json	fix(license): GPLv3 => GPL-3.0	2015-12-07 10:50:47 -08:00