Vladislav Makhov b8e8480120 Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations ... # Conflicts: # products/ASC.Files/Client/src/components/dialogs/ConnectDialog/locales/en/translation.json # products/ASC.Files/Client/src/components/dialogs/ConnectDialog/locales/ru/translation.json		2021-01-14 17:14:39 +03:00
..
Client	Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations	2021-01-14 17:14:39 +03:00
Core	Tags: fix	2021-01-13 19:09:05 +03:00
Server	Merge branch 'develop' into feature/thirdparty-integrations	2021-01-14 10:14:46 +03:00
Service	Files: removed temp	2021-01-13 12:41:29 +03:00
Tests	Files: removed temp	2021-01-13 12:41:29 +03:00