Skip to content
Snippets Groups Projects
Commit 7f166155 authored by deserevi's avatar deserevi
Browse files

merge of '874ebccc745333917f571ef55e8a141df9318e94' 

     and 'ba48d78c46eba62f6e735937d048b2db4f5d6be3'
parents 47ea2304 578d25da
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 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