Skip to content
Snippets Groups Projects
Commit f8b212bb authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '506-mac-ds-file' into 'devel_12.1.x' 

Resolve "ds_store file - fail during upload"

See merge request !397
parents ae88f78d 33ce006a
No related branches found
No related tags found
2 merge requests!412changes from 12.1.0~beta.1 into master,!397Resolve "ds_store file - fail during upload"
Pipeline #6397 passed
Stage: test
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 133 additions and 122 deletions
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment