Artem Tarasov 144c7479e2 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations ... # Conflicts: # products/ASC.Files/Client/public/locales/de/Home.json		2021-05-25 15:25:57 +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 github.com:ONLYOFFICE/AppServer into feature/translations	2021-05-25 15:25:57 +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 github.com:ONLYOFFICE/AppServer into feature/translations	2021-05-25 15:25:57 +03:00
ASC.Projects	Merge branch 'develop' into feature/translations	2021-05-20 13:11:13 +03:00