Roman a3dc928430 Merge branch 'master' into extensions-api ... # Conflicts: # package.json # src/common/cluster-store.ts # src/renderer/bootstrap.tsx # src/renderer/components/cluster-manager/clusters-menu.tsx # static/RELEASE_NOTES.md # webpack.dll.ts		2020-09-11 12:29:38 +03:00
..
common	Merge branch 'master' into extensions-api	2020-09-11 12:29:38 +03:00
extensions	Extensions-api: initial hello-world example (#817)	2020-09-09 16:19:02 +03:00
features	Fix manifests order for Metrics feature (#752)	2020-08-27 14:14:34 +03:00
main	Merge branch 'master' into extensions-api	2020-09-11 12:29:38 +03:00
migrations	remove make-syncronous and file-type calls from migration (#844)	2020-09-09 16:41:25 -04:00
renderer	Merge branch 'master' into extensions-api	2020-09-11 12:29:38 +03:00