Artem Tarasov 3db9b30e5e Merge branch 'develop' into bugfix/fixed-styles ... # Conflicts: # products/ASC.People/Client/src/pages/Profile/Section/Body/index.js		2021-06-08 17:58:29 +03:00
..
public	Web: added rule to webpack.config for woff, woff2	2021-06-06 23:39:52 +03:00
src	Merge branch 'develop' into feature/two-factor-auth	2021-06-02 23:57:00 +03:00
.babelrc	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
.gitattributes	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
.gitignore	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
Dockerfile	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
jsconfig.json	Web: applied new import from appserver/components	2021-02-24 20:11:23 +03:00
package.json	Web: added rule to webpack.config for woff, woff2	2021-06-06 23:39:52 +03:00
webpack.config.js	Web: People: deleted fonts with ext .woff, added hash to font name	2021-06-08 15:26:56 +03:00