Alexey Safronov cfccfd4093 Merge branch 'master' into feature/advanced-selector-v2 ... # Conflicts: # web/ASC.Web.Common/package.json		2019-12-09 09:16:18 +03:00
..
public	web: People: Fixed broken logo on login from People page	2019-11-26 09:52:34 +03:00
src	Merge branch 'master' into feature/advanced-selector-v2	2019-12-09 09:16:18 +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: removed reactstrap from people module	2019-12-04 10:11:13 +03:00
yarn.lock	web: Common: Added and applied new displayType "auto" for AdvancedSelector v2	2019-12-08 21:47:45 +03:00