Artem Tarasov cdecfc3ed3 Merge branch 'develop' into feature/fix-hide/show-header ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/store/files/selectors.js # web/ASC.Web.Client/src/App.js		2021-01-21 16:45:35 +03:00
..
Client	Merge branch 'develop' into feature/fix-hide/show-header	2021-01-21 16:45:35 +03:00
Server	Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop	2020-12-24 03:18:47 +03:00