AlexeySafronov 65378cc089 Merge branch 'develop' into feature/personal ... # Conflicts: # products/ASC.CRM/Client/public/index.html # products/ASC.Calendar/Client/public/index.html # products/ASC.Files/Client/public/index.html # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js # products/ASC.Files/Client/src/pages/Home/index.js # products/ASC.Mail/Client/public/index.html # products/ASC.People/Client/public/index.html # products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js # products/ASC.People/Client/src/pages/Profile/Section/Body/index.js # products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js # products/ASC.Projects/Client/public/index.html		2021-06-15 11:49:39 +03:00
..
images	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
locales	Web: Removed empty translations keys	2021-06-01 13:49:37 +03:00
favicon.ico	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
index.html	Merge branch 'develop' into feature/personal	2021-06-15 11:49:39 +03:00
manifest.json	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00