Roman 7b4e060067 Merge branch 'master' into fix-1898/watch-api-streaming ... # Conflicts: # src/renderer/api/kube-watch-api.ts # src/renderer/components/+namespaces/namespace.store.ts # src/renderer/components/+workloads-overview/overview.tsx # src/renderer/components/item-object-list/item-list-layout.tsx		2021-01-22 14:32:17 +02:00
..
common	Load k8s resources only for selected namespaces (#1918)	2021-01-22 13:18:46 +02:00
extensions	enfore unix line endings and always ending files with line endings (#1997)	2021-01-21 08:09:41 -05:00
main	Merge branch 'master' into fix-1898/watch-api-streaming	2021-01-22 14:32:17 +02:00
migrations	enfore unix line endings and always ending files with line endings (#1997)	2021-01-21 08:09:41 -05:00
renderer	Merge branch 'master' into fix-1898/watch-api-streaming	2021-01-22 14:32:17 +02:00
jest.setup.ts	Add check to extension file watch (#1677)	2020-12-08 17:30:47 +02:00