AlexeySafronov 65378cc089 Merge branch 'develop' into feature/personal ... # Conflicts: # products/ASC.CRM/Client/public/index.html # products/ASC.Calendar/Client/public/index.html # products/ASC.Files/Client/public/index.html # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js # products/ASC.Files/Client/src/pages/Home/index.js # products/ASC.Mail/Client/public/index.html # products/ASC.People/Client/public/index.html # products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js # products/ASC.People/Client/src/pages/Profile/Section/Body/index.js # products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js # products/ASC.Projects/Client/public/index.html		2021-06-15 11:49:39 +03:00
..
public	Merge branch 'develop' into feature/personal	2021-06-15 11:49:39 +03:00
src	Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring	2021-06-02 13:55:11 +03:00
.babelrc	Big Fix commit:	2021-03-22 00:34:21 +03:00
.env	Big Fix commit:	2021-03-22 00:34:21 +03:00
.gitignore	Big Fix commit:	2021-03-22 00:34:21 +03:00
analyse.js	Big Fix commit:	2021-03-22 00:34:21 +03:00
Dockerfile	Big Fix commit:	2021-03-22 00:34:21 +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