Skip to content
Commit 5c589930 authored by Joerg Jaspert's avatar Joerg Jaspert
Browse files

Merge branch 'patch-1' into 'master' 

Update ftpmaster-authorized_keys for move of coccia to UBC

See merge request !159
parents f9a79051 4440dd06
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment