gopienkonikita 6159fb0b17 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations ... # Conflicts: # products/ASC.People/Client/public/locales/de/ProfileAction.json # products/ASC.People/Client/public/locales/en/ProfileAction.json # products/ASC.People/Client/public/locales/ru/ProfileAction.json		2021-05-26 11:45:16 +03:00
..
Client	Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations	2021-05-26 11:45:16 +03:00
Server	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00