Daniil Senkiv 730ca469a1 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json # products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json # products/ASC.Files/Client/src/store/files/actions.js # products/ASC.Files/Client/src/store/files/reducers.js # products/ASC.Files/Client/src/store/files/selectors.js		2020-03-17 09:07:39 +03:00
..
ASC.Web.Api	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
ASC.Web.Client	Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files	2020-03-17 09:07:39 +03:00
ASC.Web.Common	Update yarn.lock files	2020-03-16 11:20:25 +03:00
ASC.Web.Components	Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files	2020-03-17 09:07:39 +03:00
ASC.Web.Core	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
ASC.Web.Studio	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00