Skip to content
Snippets Groups Projects
Commit 965a8ba2 authored by Simon Birnbach's avatar Simon Birnbach
Browse files

Fixed cancelling of uploads and wrong merge conflict resolution

parent 8e27b725
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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