svetlana maleeva 50d3a3f899 Merge branch 'feature/new_alfresco_wordpress' into release/1.5.0 ... # Conflicts: # Web/Controls/Common/BaseHeader/BaseHeader.ascx # Web/Controls/Help/GettingStarted/Integration/Alfresco/AlfrescoGettingStarted.ascx # Web/Controls/Help/GettingStarted/Integration/Alfresco/AlfrescoGettingStarted.de.ascx # Web/Controls/Help/Integration/Integration.ascx # Web/Controls/Help/SideMenu/Integration/IntegrationMenu.ascx # Web/Controls/Help/Video/Video.ascx # Web/css/help.less		2022-05-31 13:48:44 +03:00
..
IntegrationMenu.ascx	Merge branch 'feature/new_alfresco_wordpress' into release/1.5.0	2022-05-31 13:48:44 +03:00