AlexeySafronov b8dd8b3048 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations ... # Conflicts: # public/locales/de/Common.json # public/locales/en/Common.json # public/locales/ru/Common.json		2021-05-24 19:07:46 +03:00
..
ASC.Calendar	Merge branch 'develop' into feature/translations	2021-05-20 13:11:13 +03:00
ASC.CRM	Merge branch 'develop' into feature/translations	2021-05-20 13:11:13 +03:00
ASC.Files	Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations	2021-05-24 17:40:36 +03:00
ASC.Mail	Merge branch 'develop' into feature/translations	2021-05-20 13:11:13 +03:00
ASC.People	Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations	2021-05-24 19:07:46 +03:00
ASC.Projects	Merge branch 'develop' into feature/translations	2021-05-20 13:11:13 +03:00