Ben Gotow f1b4a23897 Merge branch 'unified-inbox-bg' into unified-inbox ... # Conflicts: # internal_packages/account-sidebar/lib/account-sidebar-store.coffee # internal_packages/account-sidebar/lib/main.coffee # internal_packages/category-picker/lib/category-picker.cjsx # spec/stores/focused-perspective-store-spec.coffee # src/flux/stores/focused-perspective-store.coffee # src/mailbox-perspective.coffee		2016-01-18 00:53:03 -08:00
..
account-sidebar	Merge branch 'unified-inbox-bg' into unified-inbox	2016-01-18 00:53:03 -08:00
attachments	fix(drag): Drag and drop files with illegial path characters	2016-01-12 13:52:01 -08:00
category-picker	Unified inbox mailbox perspectives working (sidebar disabled atm)	2016-01-18 00:47:04 -08:00
composer	Merge branch 'master' into unified-inbox	2016-01-13 17:20:34 -08:00
composer-signature	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
composer-spellcheck	fix(specs): Spec fixes for 37e1f6bb	2016-01-12 19:11:47 -08:00
composer-templates	fix(templates): rewritten "welcome" file / example template	2016-01-13 12:08:41 -08:00
composer-translate
events	Merge branch 'master' into unified-inbox	2016-01-12 08:20:55 -08:00
feedback	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
github-contact-card
inbox-contact-elements
message-autoload-images
message-list	More renaming of view => data source	2016-01-14 15:04:17 -08:00
message-view-on-github
mode-switch
notification-mailto
notification-update-available
notifications	Merge branch 'master' into unified-inbox	2016-01-12 08:20:55 -08:00
onboarding	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
personal-level-indicators	fix(indicators): Remove duplicate description key	2016-01-12 10:28:34 -08:00
phishing-detection
plugins	fix(packages): Default icon for third-party packages	2016-01-12 13:52:01 -08:00
preferences	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
print	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
quick-schedule
search-bar	Unified inbox mailbox perspectives working (sidebar disabled atm)	2016-01-18 00:47:04 -08:00
sidebar-fullcontact
system-tray
thread-list	Merge branch 'unified-inbox-bg' into unified-inbox	2016-01-18 00:53:03 -08:00
tooltip
ui-dark
ui-light
undo-redo
unread-notifications	Unified inbox mailbox perspectives working (sidebar disabled atm)	2016-01-18 00:47:04 -08:00
worker-sync	refactor(rip-current-account): Rips out AccountStore.current	2016-01-08 14:22:13 -08:00
worker-ui