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
..
ArticleHeaderLoader	Web: Components/Common: fix imports	2021-02-26 00:19:45 +03:00
CircleLoader	Web: Components/Common: fix imports	2021-02-26 00:19:45 +03:00
FilterLoader	Web: Components/Common: fix imports	2021-02-26 00:19:45 +03:00
GroupLoader	Web: Components/Common: fix imports	2021-02-26 00:19:45 +03:00
HeaderLoader	Web: NavMenu/PageLayout: Was done:	2021-06-04 14:42:21 +03:00
HistoryRowsLoader	Web: Components/Common: fix imports	2021-02-26 00:19:45 +03:00
ProfileViewLoader	Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code	2021-06-11 16:57:17 +03:00
RectangleLoader	Web: Components/Common: fix imports	2021-02-26 00:19:45 +03:00
RowLoader	Web: Components/Common: fix imports	2021-02-26 00:19:45 +03:00
RowsLoader	Web: Components/Common: fix imports	2021-02-26 00:19:45 +03:00
SectionHeaderLoader	Web: Components/Common: fix imports	2021-02-26 00:19:45 +03:00
TreeFolderLoader	Web: Components/Client: fix tree loader, fix version badge	2021-05-17 12:40:46 +03:00
all.Loaders.stories.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
index.js	Web: Components/Common: fix imports	2021-02-26 00:19:45 +03:00
SettingsFilesLoader.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
TextLoader.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00