Skip to content
Snippets Groups Projects
Commit 884b7b64 authored by matta's avatar matta
Browse files

merge of '1fde72454160f6464aeb674e62a8c3cde2a59c92' 

     and 'b60568b8f846016dabc39a265610afff7767111c'
parents 861c627a 7035a004
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 21 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