Artem Tarasov 6ec9db8870 Merge branch 'feature/translations' of 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-26 18:02:11 +03:00
..
de	Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations	2021-05-26 18:02:11 +03:00
en	Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations	2021-05-26 18:02:11 +03:00
ru	Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations	2021-05-26 18:02:11 +03:00