svetlana maleeva 49112c908e Merge branch 'feature/android-5.5.0' into develop ... # Conflicts: # Web/App_GlobalResources/Resource.de.resx # Web/App_GlobalResources/Resource.resx # Web/Controls/Help/ArticlesCompleteList/MobileApps/4338_mob_andr_endnotes.de.ascx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.de.ascx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrOperationsOnObjects/AndrAdjustChartSettings/AndrAdjustChartSettings.fr.ascx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrToolsAndSettings/AndrSaveExportPrintDoc/AndrSaveExportPrintDoc.fr.ascx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPEOperationsOnObjects/AndrPEAdjustChartSettings/AndrPEAdjustChartSettings.fr.ascx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.de.ascx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ascx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.de.ascx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrToolsAndSettings/AndrChangeSpreadsheetSettings/AndrChangeSpreadsheetSettings.fr.ascx		2022-11-14 11:29:46 +03:00
..
AndroidProjects	Rename controls	2022-02-15 17:04:43 +03:00
Documents	Merge branch 'feature/android-5.5.0' into develop	2022-11-14 11:29:46 +03:00