Roman 21296d6d12 Merge branch 'master' into monaco_editor_refactoring ... # Conflicts: # src/common/user-store/user-store.ts # src/renderer/bootstrap.tsx # src/renderer/components/dock/__test__/log-tab.store.test.ts # src/renderer/utils/storageHelper.ts		2021-10-28 12:58:06 +03:00
..
__tests__	Merge remote-tracking branch 'origin/master' into monaco_editor_refactoring	2021-10-22 16:38:11 +03:00
helpers	Stop using @electron/remote to obtain app.getPath() (#4078)	2021-10-27 21:07:41 -04:00