Skip to content
Verified Commit dc93578c authored by Joerg Jaspert's avatar Joerg Jaspert
Browse files

Merge branch 'master' into deploy 

* master:
  web repo is on salsa, update from there
parents ce53847e 56f2eaf4
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