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

Merge branch 'master' into guidevelopment 

Conflicts:
	sflphone-client-gnome/src/config/configwindow.c
	sflphone-client-gnome/src/menus.c
parents d374a760 d297d925
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 14253 additions and 63 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment