Skip to content
Snippets Groups Projects
Commit 05381a13 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'conference' of... 

Merge branch 'conference' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone into conference

Conflicts:
	sflphone-client-gnome/src/config/accountconfigdialog.c
parents 1952b0c4 93a0292a
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