AlexeySafronov a31dc583c1 Merge branch 'develop' into feature/personal ... # Conflicts: # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/components/panels/SharingPanel/index.js # products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js # products/ASC.Files/Client/src/pages/Settings/index.js		2021-07-02 16:26:45 +03:00
..
public	Merge branch 'develop' into feature/personal	2021-07-02 16:26:45 +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	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
.env	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
.gitignore	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
analyse.js	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
Dockerfile	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +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