Viktor Fomin d77b0b6b32 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/security-settings ... # Conflicts: # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/trustedMail.js		2022-06-08 17:53:49 +03:00
..
asc-web-common	Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/security-settings	2022-06-08 17:53:49 +03:00
asc-web-components	Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/security-settings	2022-06-08 17:53:49 +03:00
browserslist-config-asc	Bump version to v1.2.0	2022-04-21 19:15:08 +03:00