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

Merge branch 'release'

Conflicts:
	sflphone-client-gnome/src/contacts/calltree.c
	sflphone-common/src/managerimpl.cpp
parents 26720c22 5c907ad8
Branches
No related tags found
No related merge requests found
Showing
with 3125 additions and 285 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment