Skip to content
Snippets Groups Projects
Commit a0455278 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'master' into m_savard

Conflicts:

	sflphone-gtk/src/calltree.c
parents ea9dcf72 1cf72863
Branches
No related tags found
No related merge requests found
Showing
with 277 additions and 283 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment