Roman a840eccc28 Merge remote-tracking branch 'origin/master' into mobx-6.2 ... # Conflicts: # src/renderer/components/+catalog/catalog.tsx		2021-05-03 18:51:40 +03:00
..
common	Merge remote-tracking branch 'origin/master' into mobx-6.2	2021-05-03 13:29:04 +03:00
extensions	Merge remote-tracking branch 'origin/master' into mobx-6.2	2021-05-03 13:29:04 +03:00
main	master-merge fixes, upgrading packages: mobx-observable-history@2.0, mobx@6.3, mobx-react	2021-05-03 16:41:36 +03:00
migrations	Flatten user preferences in user store (#2587)	2021-04-27 09:44:02 -04:00
renderer	Merge remote-tracking branch 'origin/master' into mobx-6.2	2021-05-03 18:51:40 +03:00
jest.setup.ts	refactoring configuration of external packages with explicit function-call (mobx/immer)	2021-05-03 13:17:23 +03:00