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
..
public	Web: People: change title of pages	2020-02-17 16:50:19 +03:00
src	People.Client: Home: Fixed people row default width	2020-03-16 12:20:29 +03:00
.env	web: clients: Fixed CRA proxy bug;	2020-02-26 10:02:37 +03:00
.gitignore	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
config-overrides.js	People.Client: fixed webpack config for moving translation resources	2019-09-03 13:35:50 +03:00
package.json	web: clients: Fixed CRA proxy bug;	2020-02-26 10:02:37 +03:00
yarn.lock	Update yarn.lock files	2020-03-16 11:20:25 +03:00