svetlana maleeva 4c38a95043 Merge branch 'develop' into feature/editing_MobApps ... # Conflicts: # Web/Controls/Help/MobApps/MobDocs/CommonOperations/OpenCreateFiles/OpenCreateFiles.fr.ascx # Web/Controls/Help/MobApps/MobDocs/DocumentEditor/BasicOperations/NavigateDocument/NavigateDocument.fr.ascx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPEToolsAndSettings/AndrWebMacros/AndrWebMacros.fr.ascx # Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.fr.ascx # Web/Controls/Help/MobApps/MobDocs/MobileDocsOverview/MobileDocsOverview.fr.ascx # Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PESlideParameters/ChangeSlideBackground/ChangeSlideBackground.fr.ascx		2022-11-08 19:04:41 +03:00
..
AndroidProjects	Merge branch 'feature/translations-fr-new' into release/1.6.0	2022-08-02 17:14:15 +03:00
MobDocs	Merge branch 'develop' into feature/editing_MobApps	2022-11-08 19:04:41 +03:00
MobileProjects	Add missing link to MobileProjects.ascx	2022-08-08 20:24:49 +03:00