|
|
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 |
|
Viktor Fomin
|
e5906324c5
|
Web: Client: fixed key
|
2021-04-19 13:49:36 +03:00 |
|
Viktor Fomin
|
62edc883db
|
Web: Client: add translations
|
2021-04-18 23:34:26 +03:00 |
|
Viktor Fomin
|
dd4ca59e66
|
Web: Client: add translations
|
2021-04-14 15:23:03 +03:00 |
|
Alexey Kostenko
|
544a24d0f1
|
Web: Client/Components: Style fix and added translations
|
2021-04-13 09:45:52 +03:00 |
|
|
|
85a500eac6
|
Web: Client: Simplified translation
|
2021-02-19 20:26:41 +03:00 |
|
