Skip to content
Snippets Groups Projects
Commit 855b8d4d authored by Shpuld Shpludson's avatar Shpuld Shpludson
Browse files

fix conflict

parents d3187720 4f66221a
No related branches found
No related tags found
2 merge requests!12172.1.0 into master,!1137Add visual indication for drag&dropping files, make dropzone bigger
Pipeline #27038 passed
Stage: lint
Stage: build
Stage: test