Alexey Safronov 159bdc1a72 Merge branch 'master' into feature/redesign ... # Conflicts: # web/ASC.Web.Common/package.json # web/ASC.Web.Components/package.json		2020-02-12 09:40:56 +03:00
..
public	web: forbade a scalability	2019-12-13 13:25:09 +03:00
src	Merge branch 'master' into feature/redesign	2020-02-12 09:40:56 +03:00
.env	temp fix cra bug with public_url in development mode	2019-07-15 12:33:28 +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: People: Update all dependencies	2020-01-15 11:59:25 +03:00
yarn.lock	web: Common: Extended PeopleSelector component with Me option	2020-02-02 17:33:44 +03:00