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

merge of '08c28c2ace6ceeef06295117590b117026c7caa3' 

     and 'faa47b9ee06b867004fb69432b0c45acb9f9eb86'
parents 64839d60 32d1fcc8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 53 additions and 118 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