svetlana maleeva 0bbda1b219 Merge branch 'feature/issue31' into develop ... # Conflicts: # Web/App_GlobalResources/Resource.de.resx # Web/App_GlobalResources/Resource.es.resx # Web/App_GlobalResources/Resource.fr.resx # Web/App_GlobalResources/Resource.resx		2022-11-18 16:48:02 +03:00
..
Resource.de.resx	Merge branch 'feature/issue31' into develop	2022-11-18 16:48:02 +03:00
Resource.es.resx	Merge branch 'feature/issue31' into develop	2022-11-18 16:48:02 +03:00
Resource.fr.resx	Merge branch 'feature/issue31' into develop	2022-11-18 16:48:02 +03:00
Resource.it.resx	Merge branch 'feature/structure-fixes' into develop	2022-11-14 12:15:47 +03:00
Resource.resx	Merge branch 'feature/issue31' into develop	2022-11-18 16:48:02 +03:00
Resource.ru.resx	Merge branch 'feature/issue31' into develop	2022-11-18 16:48:02 +03:00