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
..
api	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth	2021-05-31 09:23:53 +03:00
components	Merge branch 'develop' into bugfix/fixed-styles	2021-06-02 15:09:03 +03:00
constants	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
desktop	Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")	2021-06-02 10:59:07 +03:00
history	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
hoc	Added and applied Common.json for common translations (languages issue)	2021-04-29 10:14:47 +03:00
store	Web: Common: added backupCodes in tfa store	2021-06-08 14:19:36 +03:00
utils	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
custom.scss	Web: People: deleted fonts with ext .woff, added hash to font name	2021-06-08 15:26:56 +03:00
index.js	Web: Deleted useless exports.	2021-03-17 16:45:36 +03:00
package.json	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00