|
|
4afdf74578
|
Merge branch 'feature/control-panel-guides'
# Conflicts:
# Web/Controls/Help/ArticlesCompleteList/ControlPanel/90023_ce_install_mail_server/90023_ce_install_mail_server.ru.ascx
# Web/Controls/Help/ArticlesCompleteList/ControlPanel/90026_update_community/90026_update_community.ru.ascx
# Web/Controls/Help/Installation/WorkspaceCommunity.ascx
# Web/administration/control-panel-community-backup.aspx
# Web/administration/control-panel-community-branding.aspx
# Web/administration/control-panel-community-encryption.aspx
# Web/administration/control-panel-community-full-text-search.aspx
# Web/administration/control-panel-community-https.aspx
# Web/administration/control-panel-community-ldap.aspx
# Web/administration/control-panel-community-multitenancy.aspx
# Web/administration/control-panel-community-sso-adfs.aspx
# Web/administration/control-panel-community-sso-description.aspx
# Web/administration/control-panel-community-sso-onelogin.aspx
# Web/administration/control-panel-community-sso-shibboleth.aspx
# Web/administration/control-panel-community-storage.aspx
# Web/css/common.less
|
2020-11-05 15:46:55 +03:00 |
|
