Skip to content
Snippets Groups Projects
Commit a555f721 authored by Leifur Halldor Asgeirsson's avatar Leifur Halldor Asgeirsson
Browse files

Merge branch 'master' into provider_conf

parents 3d4ed29b a1b12d3d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 11 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