svetlana maleeva ad8a710955 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release ... # Conflicts: # Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.es.ascx # Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.fr.ascx # Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.it.ascx # Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.ru.ascx # Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.ascx # Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.de.ascx # Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.es.ascx # Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.fr.ascx # Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.it.ascx # Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.ru.ascx		2022-04-22 14:55:27 +03:00
..
Resource.de.resx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-22 14:55:27 +03:00
Resource.es.resx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-22 14:55:27 +03:00
Resource.fr.resx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-22 14:55:27 +03:00
Resource.it.resx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-22 14:55:27 +03:00
Resource.resx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-22 14:55:27 +03:00
Resource.ru.resx	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-22 14:55:27 +03:00