Skip to content
Snippets Groups Projects
Commit 4c05365e authored by Pierre-Luc Beaudoin's avatar Pierre-Luc Beaudoin
Browse files

Merge commit 'origin/master' 

Conflicts:

	sflphone-gtk/src/calltree.c
	sflphone-gtk/src/menus.c
	sflphone-gtk/src/sliders.c
parents e7f22da8 ef70b332
Branches
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