Skip to content
Snippets Groups Projects
Commit 70dca8de authored by sveseli's avatar sveseli
Browse files

Merge branch 'master' into 'rsync-ssh-key' 

# Conflicts:
#   doc/RELEASE_NOTES.txt
parents d41fe0b4 922034a3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 3 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