Ben Gotow 2f3ca2a906 Merge branch 'master' of ssh://github.com/nylas/k2 ... # Conflicts: # packages/nylas-core/hook-transaction-log.js # packages/nylas-core/models/account/transaction.js		2016-07-14 17:17:22 -07:00
..
nylas-api	Merge branch 'master' of ssh://github.com/nylas/k2	2016-07-14 17:17:22 -07:00
nylas-core	Merge branch 'master' of ssh://github.com/nylas/k2	2016-07-14 17:17:22 -07:00
nylas-dashboard	Add process load counts to the dashboard	2016-07-14 14:51:54 -07:00
nylas-message-processor	Merge branch 'master' of ssh://github.com/nylas/k2	2016-07-14 17:17:22 -07:00
nylas-metrics	Moves metrics into its own pkg to be able to instrument other services	2016-07-14 11:20:58 -07:00
nylas-sync	Merge branch 'master' of ssh://github.com/nylas/k2	2016-07-14 17:17:22 -07:00