Roman 277dfb2e3d Merge remote-tracking branch 'origin/master' into monaco_editor_up ...

# Conflicts:
#	src/common/user-store/preferences-helpers.ts
#	src/common/user-store/user-store.ts
#	src/renderer/components/dock/__test__/dock-tabs.test.tsx
#	src/renderer/components/dock/create-resource.tsx
#	src/renderer/components/dock/terminal-window.tsx
#	src/renderer/theme.store.ts

2021-11-03 12:24:25 +02:00

..

__tests__

Merge remote-tracking branch 'origin/master' into monaco_editor_up

2021-11-03 12:24:25 +02:00

helpers

Lint: comma-spacing (error) & comma-dangle (error) (#4200)

2021-11-02 17:38:20 -04:00