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

Merge branch 'master' into m_savard

Conflicts:
	sflphone-client-gnome/src/config/accountconfigdialog.c
parents 204b7da3 4a20e0c9
Branches
Tags
No related merge requests found
Showing
with 5802 additions and 11108 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment