svetlana maleeva f2d897bd43 Merge branch 'feature/databases' into feature/test-fixes-december-23 ... # Conflicts: # Web/App_GlobalResources/Resource.resx		2024-03-14 17:57:09 +03:00
..
Resource.de.resx	Merge branch 'feature/build_8.0' into feature/test-fixes-december-23	2024-02-28 12:47:14 +03:00
Resource.es.resx	Fixes for statistical-functions.ascx	2024-02-14 14:37:06 +03:00
Resource.fr.resx	Merge branch 'feature/build_8.0' into feature/test-fixes-december-23	2024-02-28 12:47:14 +03:00
Resource.it.resx	Fixes for statistical-functions.ascx	2024-02-14 14:37:06 +03:00
Resource.resx	Merge branch 'feature/databases' into feature/test-fixes-december-23	2024-03-14 17:57:09 +03:00
Resource.ru.resx	Merge branch 'feature/build_8.0' into feature/test-fixes-december-23	2024-02-28 12:47:14 +03:00