Merge branch 'NiceDev' into develop

# Conflicts:
#	src/modules/06_evaluate/components/EvaluateStepMain.vue
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-01-08 14:18:10 +07:00
commit 37bef4e836

Diff content is not available