TatianaLopaeva 0f3eb1350b Merge branch 'develop' into feature/team-template ... # Conflicts: # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json		2021-04-20 12:05:19 +03:00
..
files	Web: Files: added ConflictResolveDialog, refactoring files operations	2021-04-16 16:04:50 +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: People: Fix conversation of Filter to URL and back	2021-03-20 13:16:45 +03:00
portal	Web: Common: fixed getShortenedLink	2021-03-22 19:18:30 +03:00
settings	Web: Rename functions.	2021-04-16 15:35:02 +03:00
user	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
client.js	Big Fix commit:	2021-03-22 00:34:21 +03:00
index.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00