Commit 8b692977 authored by Svetoslav's avatar Svetoslav
Browse files

resolved conflicts for merge of 6ac53bee to master 

Change-Id: I7a160d224f20e825f060561725b11f5cc7b2c685
parents cdc2c334 6ac53bee
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment