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

Merge commit 'origin/release' into release 

Conflicts:

	sflphone-gtk/src/calltree.c
parents 0fdddaea 5447a13e
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment