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

Merge branch 'pierre-luc' 

Conflicts:
	sflphone-client-gnome/src/config/accountwindow.c
parents becca3d4 8b65e3c6
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 184 additions and 96 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment