Mailspring/internal_packages/account-sidebar/lib
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
..
components AccountSidebar package refactor: 2016-01-15 16:55:21 -08:00
account-sidebar-actions.coffee AccountSidebar package refactor: 2016-01-15 16:55:21 -08:00
account-sidebar-items.coffee AccountSidebar package refactor: 2016-01-15 16:55:21 -08:00
account-sidebar-sections.coffee AccountSidebar package refactor: 2016-01-15 16:55:21 -08:00
account-sidebar-store.coffee Merge branch 'unified-inbox-bg' into unified-inbox 2016-01-18 00:53:03 -08:00
main.coffee AccountSidebar package refactor: 2016-01-15 16:55:21 -08:00