Viktor Fomin 547c1782f1 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding ... # Conflicts: # packages/client/public/locales/en/Settings.json # packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js		2022-08-30 12:34:48 +03:00
..
images	Merge branch 'develop' into feature/create-room	2022-08-26 19:28:06 +03:00
locales	Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding	2022-08-30 12:34:48 +03:00
index.html	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00