svetlana maleeva d11f74a66d Merge branch 'feature/structure-fix' into feature/test-fixes-december-23 ... # Conflicts: # Web/App_GlobalResources/Resource.de.resx # Web/App_GlobalResources/Resource.resx		2024-04-17 17:55:02 +03:00
..
Resource.de.resx	Edit statistical-functions.ascx	2024-04-17 17:50:17 +03:00
Resource.es.resx	Edit statistical-functions.ascx	2024-04-17 17:50:17 +03:00
Resource.fr.resx	Edit statistical-functions.ascx	2024-04-17 17:50:17 +03:00
Resource.it.resx	Edit statistical-functions.ascx	2024-04-17 17:50:17 +03:00
Resource.resx	Merge branch 'feature/structure-fix' into feature/test-fixes-december-23	2024-04-17 17:55:02 +03:00
Resource.ru.resx	Edit statistical-functions.ascx	2024-04-17 17:50:17 +03:00