svetlana maleeva 0944f31fb9 Merge branch 'feature/databases' into release/1.21.0 ... # Conflicts: # Web/App_GlobalResources/Resource.resx		2024-04-11 12:24:28 +03:00
..
Resource.de.resx	Merge branch 'feature/structure' into release/1.21.0	2024-04-11 12:19:42 +03:00
Resource.es.resx	Edit statistical-functions.ascx	2024-04-01 16:04:12 +03:00
Resource.fr.resx	Merge branch 'feature/structure' into release/1.21.0	2024-04-11 12:19:42 +03:00
Resource.it.resx	Edit statistical-functions.ascx	2024-04-01 16:04:12 +03:00
Resource.resx	Merge branch 'feature/databases' into release/1.21.0	2024-04-11 12:24:28 +03:00
Resource.ru.resx	Merge branch 'feature/structure' into release/1.21.0	2024-04-11 12:19:42 +03:00