svetlana maleeva 7acab4b290 Merge branch 'feature/docspace-install' into feature/DocSpace-1.1.0 ... # Conflicts: # Web/App_GlobalResources/Resource.resx		2023-07-19 10:54:02 +03:00
..
Resource.de.resx	Merge branch 'feature/structure' into release/1.13.0	2023-06-09 18:35:46 +03:00
Resource.es.resx	Edit math-trigonometry-functions.ascx tag	2023-05-02 18:51:02 +03:00
Resource.fr.resx	Merge branch 'feature/structure' into release/1.13.0	2023-06-09 18:35:46 +03:00
Resource.it.resx	Edit math-trigonometry-functions.ascx tag	2023-05-02 18:51:02 +03:00
Resource.resx	Merge branch 'feature/docspace-install' into feature/DocSpace-1.1.0	2023-07-19 10:54:02 +03:00
Resource.ru.resx	Merge branch 'feature/structure' into release/1.13.0	2023-06-09 18:35:46 +03:00