Alexey Safronov 53737a06e8 Merge branch 'develop' into refactoring/client ... # Conflicts: # packages/editor/src/client/components/DynamicComponent.js # packages/editor/src/client/components/Editor.js # packages/editor/src/client/components/SelectFileDialog.js # packages/editor/src/client/components/SelectFolderDialog.js # packages/editor/src/client/components/SharingDialog.js # packages/editor/src/client/helpers/utils.js # packages/editor/src/client/helpers/withDialogs.js # packages/editor/src/server/lib/helpers/index.js		2022-07-28 10:38:29 +03:00
..
api	Web: Fix 'Accounts' imports, routes and includes	2022-07-26 12:51:52 +03:00
components	Web: Merged 'People' module with 'Client' and fixed paths	2022-07-25 22:19:47 +03:00
constants	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
desktop	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
history	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
hoc	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
store	Merge branch 'develop' into refactoring/client	2022-07-28 10:38:29 +03:00
sw	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
utils	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
browserslist-config-asc.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
custom.scss	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
fonts.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
index.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
opensansoffline.scss	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
package.json	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00