Artem Tarasov 54b96e8aa0 Merge branch 'develop' into feature/thumbnails ... # Conflicts: # packages/asc-web-common/components/PageLayout/sub-components/SelectedFrame.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js		2021-04-15 15:05:15 +03:00
..
api	Web: People: fixed group list query	2021-04-05 16:18:41 +03:00
components	Merge branch 'develop' into feature/thumbnails	2021-04-15 15:05:15 +03:00
constants	Added New Proxy settings	2021-04-05 15:49:02 +03:00
desktop	Web: Move toastr function to Web Client (mf: "studio/toastr")	2021-03-03 16:46:04 +03:00
history	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
store	Web: Fix hashSettings setup	2021-04-08 10:24:06 +03:00
utils	Web: Fixed export and import registerSW	2021-04-07 15:41:42 +03:00
index.js	Web: Deleted useless exports.	2021-03-17 16:45:36 +03:00
package.json	Web: Added SelectedFrame	2021-04-13 09:35:07 +03:00