svetlana maleeva 7019439900 Merge branch 'develop' into feature/web-apps-help ... # Conflicts: # Web/App_GlobalResources/Resource.de.resx # Web/App_GlobalResources/Resource.fr.resx # Web/App_GlobalResources/Resource.resx # Web/App_GlobalResources/Resource.ru.resx # Web/Controls/Help/Tags/change-color/change-color.es.ascx # Web/Controls/Help/Tags/create-event/create-event.de.ascx # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/UsageInstructions/MergeCells.htm # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/MergeCells.htm		2022-08-12 15:03:45 +03:00
..
HelpfulHints	Merge branch 'develop' into feature/web-apps-help	2022-08-12 15:03:45 +03:00
images	Continue translating changes for 7.2 (ru)	2022-08-08 20:10:29 +03:00
ProgramInterface	Continue translating changes for 7.2 (ru)	2022-08-08 20:10:29 +03:00
search	Replace 'apps' folder with the new one from 'web-apps' repository	2022-06-21 13:12:39 +03:00
UsageInstructions	Partial translations - 7.2 - ru	2022-08-12 13:23:42 +03:00
callback.js	Add OfficeWeb from production site.	2019-12-10 17:18:55 +03:00
Contents.json	Continue translating changes for 7.2 (ru)	2022-08-08 20:10:29 +03:00
editor.css	Replace 'apps' folder with the new one from 'web-apps' repository	2022-06-21 13:12:39 +03:00