Vladislav Makhov 1e483de4ba Merge branch 'develop' into feature/third-party-settings ... # Conflicts: # web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json # web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json # web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js # web/ASC.Web.Client/src/store/settings/actions.js # web/ASC.Web.Client/src/store/settings/reducer.js # web/ASC.Web.Common/src/api/settings/index.js # web/ASC.Web.Components/src/components/icons/svg/index.js		2020-11-03 15:29:09 +03:00
..
public	Web: Fixed PWA App icon url on iOS	2020-11-02 21:42:53 +03:00
src	Web: People : UserContent : Added sectionWidth property, fixed missing styles	2020-10-30 14:23:56 +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
analyse.js	Web: People: Added Webpack-bundle-analyzer	2020-08-31 11:59:35 +03:00
config-overrides.js	Web: People: Applied prettier style fix	2020-10-16 16:23:51 +03:00
package.json	Web: People: Applied prettier style fix	2020-10-16 16:23:51 +03:00
yarn.lock	Merge branch 'develop' into feature/third-party-settings	2020-11-03 15:29:09 +03:00