Ben Gotow cb5f2985ef Merge branch 'master' into unified-inbox ... # Conflicts: # spec/stores/file-download-store-spec.coffee		2016-01-13 17:20:34 -08:00
..
account-store-spec.coffee	Merge branch 'master' into unified-inbox	2016-01-13 17:20:34 -08:00
contact-store-spec.coffee
database-setup-query-builder-spec.coffee
database-store-spec.coffee
database-transaction-spec.coffee
draft-store-proxy-spec.coffee
draft-store-spec.coffee
file-download-store-spec.coffee	Merge branch 'master' into unified-inbox	2016-01-13 17:20:34 -08:00
file-upload-store-spec.coffee
focused-contacts-store-spec.coffee
focused-content-store-spec.coffee
focused-perspective-store-spec.coffee
message-store-spec.coffee
task-queue-spec.coffee
thread-counts-store-spec.coffee
unread-badge-store-spec.coffee