Viktor Fomin 32868de412 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign ... # Conflicts: # packages/asc-web-common/api/settings/index.js # public/locales/de/Common.json		2022-02-22 13:53:00 +03:00
..
images	Server: Files: Configuration: Fixed logo type for filling form mode	2021-12-09 12:45:52 +03:00
locales	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign	2022-02-22 13:53:00 +03:00
index.html	Web: Removed duplicates	2021-09-24 21:18:50 +03:00