svetlana maleeva 12603e51f5 Merge branch 'Onlyoffice_develop' ... # Conflicts: # Web/Controls/Help/ArticlesCompleteList/Guides/149_task-statuses/149_task-statuses.ascx # Web/Controls/Help/ArticlesCompleteList/Guides/149_task-statuses/149_task-statuses.ru.ascx # Web/Controls/Help/Guides/Projects/TaskStatuses/TaskStatuses.ascx # Web/Controls/Help/Guides/Projects/TaskStatuses/TaskStatuses.ru.ascx # Web/Controls/Help/Projects/Projects.ru.ascx		2019-12-23 18:13:34 +03:00
..
step1.png	Merge branch 'Onlyoffice_develop'	2019-12-23 18:13:34 +03:00
step2_1.png	Merge branch 'Onlyoffice_develop'	2019-12-23 18:13:34 +03:00
step2_2.png	Merge branch 'Onlyoffice_develop'	2019-12-23 18:13:34 +03:00
step2_3.png	Merge branch 'Onlyoffice_develop'	2019-12-23 18:13:34 +03:00
step3.png	Merge branch 'Onlyoffice_develop'	2019-12-23 18:13:34 +03:00