gopienkonikita 69889cab4c Merge branch 'develop' into feature/privacy-rooms-page ... # Conflicts: # packages/asc-web-common/components/PageLayout/index.js # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/helpers/constants.js # products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js # products/ASC.Files/Client/src/store/FilesStore.js		2021-06-30 16:28:37 +03:00
..
files	Merge branch 'develop' into feature/privacy-rooms-page	2021-06-30 16:28:37 +03:00
groups	Web: People: fixed group list query	2021-04-05 16:18:41 +03:00
modules	Web: Proxy fixes	2021-03-22 17:35:33 +03:00
people	Web: Client: Added group button menu, fixed api getListAdmins, the ability to add new administrators	2021-04-29 09:40:55 +03:00
portal	Web: Common: fixed getShortenedLink	2021-03-22 19:18:30 +03:00
settings	Web: Common: commentary changes	2021-05-30 17:26:30 +03:00
user	Web: Common: added login with tfa code method	2021-05-17 16:32:22 +03:00
client.js	Web: Common: fixed reloading login page	2021-05-19 17:17:07 +03:00
index.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00