Skip to content
Snippets Groups Projects
Commit 9699edd3 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'master' of ssh://review.sflphone.org:29420/sflphone 

Conflicts:
	CODING

Change-Id: Ibb438278ecb22ed238a2d80301bd7252cc1fa454
parents d3afb2a9 86779625
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment