Skip to content
Snippets Groups Projects
Commit d374a760 authored by pierre-luc's avatar pierre-luc
Browse files

Merge branch 'pierre-luc' into guidevelopment 

Conflicts:
	sflphone-client-gnome/src/config/configwindow.c
parents 4db7bc7e a1336a43
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1123 additions and 1138 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment