Artem Tarasov 9b27d51ac5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces ... # Conflicts: # products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js # products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js # products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js # products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js # products/ASC.Files/Client/src/helpers/desktop.js # products/ASC.Files/Client/src/i18n.js # products/ASC.Files/Client/src/store/FilesStore.js # products/ASC.Files/Client/src/store/SettingsStore.js # products/ASC.Files/Client/src/store/ThirdPartyStore.js # products/ASC.Files/Client/src/store/TreeFoldersStore.js # products/ASC.Files/Client/src/store/UploadDataStore.js # products/ASC.Files/Client/src/store/VersionHistoryStore.js # products/ASC.People/Client/src/helpers/converters.js # products/ASC.People/Client/src/helpers/people-helpers.js		2021-02-25 17:57:32 +03:00
..
ASC.CRM/Server	Added CRM	2021-01-26 20:36:03 +03:00
ASC.Files	Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces	2021-02-25 17:57:32 +03:00
ASC.People	Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces	2021-02-25 17:57:32 +03:00
ASC.Projects/Server	Projects: fix	2021-01-26 20:09:50 +03:00