Artem Tarasov 43491f42a9 Merge branch 'develop' into feature/thumbnails ... # Conflicts: # products/ASC.Files/Client/src/Files.jsx # 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 # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/store/InitFilesStore.js		2021-04-05 10:54:27 +03:00
..
api	Web: Client: fixed owner change	2021-03-22 20:56:53 +03:00
components	Merge branch 'develop' into feature/thumbnails	2021-04-01 18:19:09 +03:00
constants	Web: Proxy fixes	2021-03-22 17:35:33 +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: common: remove unused imports	2021-04-02 15:36:40 +03:00
utils	Web: Moved sw-template to @appserver/common and removed api cache (translation issue)	2021-03-24 11:45:58 +03:00
index.js	Web: Deleted useless exports.	2021-03-17 16:45:36 +03:00
package.json	Web: Common: Revert proxy.url	2021-03-22 20:01:28 +03:00