Viktor Fomin 0128b01518 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth ... # Conflicts: # products/ASC.People/Client/public/locales/en/Profile.json # products/ASC.People/Client/public/locales/ru/Profile.json # products/ASC.People/Client/src/pages/Profile/Section/Body/index.js # web/ASC.Web.Client/public/locales/en/Confirm.json # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Confirm.json # web/ASC.Web.Client/public/locales/ru/Settings.json		2021-04-26 15:57:19 +03:00
..
public	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth	2021-04-26 15:57:19 +03:00
src	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth	2021-04-26 15:57:19 +03:00
.babelrc	Web: People: init People build and loading (Moved out from CRA)	2020-12-03 13:09:33 +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
Dockerfile	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
package.json	Bump version v0.1.7	2021-04-22 14:13:12 +03:00
webpack.config.js	Web: Moved sw-template to @appserver/common and removed api cache (translation issue)	2021-03-24 11:45:58 +03:00