Artem Tarasov 10f2cde731 Merge branch 'develop' into feature/doceditor-ssr ... # Conflicts: # .gitignore		2022-07-18 17:05:53 +03:00
..
files	Web: Files: Fix display name decoding ('Shared With Me' Author column issue)	2022-06-15 19:49:18 +03:00
groups	Web: People/Common: added sorting of groups in the tree	2021-11-16 19:27:27 +03:00
modules	Web: Proxy fixes	2021-03-22 17:35:33 +03:00
people	Web:Common:Api: add new api method 'changeTheme'	2022-04-21 10:23:06 +03:00
portal	merge	2022-03-24 20:56:51 +03:00
settings	Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime	2022-05-03 21:22:47 +03:00
user	Web: Common: API: add skipLogout option	2022-03-31 22:34:32 +03:00
client.js	Web: Common: add skipLogout option	2022-03-15 14:33:21 +03:00
index.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00