svetlana maleeva da589b70d7 Merge branch 'feature/help_fixes' into develop ... # Conflicts: # Web/App_GlobalResources/Resource.de.resx # Web/App_GlobalResources/Resource.es.resx # Web/App_GlobalResources/Resource.fr.resx # Web/App_GlobalResources/Resource.it.resx # Web/App_GlobalResources/Resource.resx # Web/App_GlobalResources/Resource.ru.resx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.fr.ascx # Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrCellTextFormatting/AndrSEFontTypeSizeColor/AndrSEFontTypeSizeColor.fr.ascx # Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/SpreadsheetEditor/FreezeRowsColumns/FreezeRowsColumns.fr.ascx # Web/Controls/Help/Tags/TagsCompleteArticleList.ascx		2022-11-14 10:42:10 +03:00
..
Alibaba	Merge branch 'feature/translations-fr-new' into release/1.6.0	2022-08-02 17:14:15 +03:00
Amazon	Add translations fr	2022-07-08 12:56:39 +03:00
Cloudron	Merge branch 'feature/translations-fr-new' into release/1.6.0	2022-08-02 17:14:15 +03:00
Common	Fix #28	2022-09-15 18:31:26 +03:00
Community	Add new translations - fr	2022-07-08 13:35:48 +03:00
ControlPanel	Merge branch 'feature/translations-fr-new' into release/1.6.0	2022-08-02 17:14:15 +03:00
DeveloperEdition	Merge branch 'feature/help_fixes' into develop	2022-11-14 10:42:10 +03:00
DigitalOcean	Add translations fr	2022-07-08 12:56:39 +03:00
Docker	Merge branch 'feature/arm7.2' into release/1.7.0	2022-09-26 17:54:39 +03:00
DocsEnterprise/windows/InstallEnterpriseEdition	Add translations fr	2022-07-08 12:56:39 +03:00
Document	Update DSChangelog.ascx (v7.2.1)	2022-10-21 11:38:42 +03:00
Enterprise	Add translations fr	2022-07-08 12:56:39 +03:00
Linux	Fix #39	2022-11-09 15:00:25 +03:00
Mail	Try to fix 3 tags	2022-03-29 13:40:15 +03:00
Talk	Add new translations - fr	2022-07-08 13:35:48 +03:00
Vultr	Merge branch 'feature/translations-fr-new' into release/1.6.0	2022-08-02 17:14:15 +03:00
Windows	Merge branch 'feature/translations-fr-new' into release/1.6.0	2022-08-02 17:14:15 +03:00
Workspace	Fixed translations	2022-07-11 17:45:01 +03:00