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

Merge branch 'master' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone 

Conflicts:
	sflphone-client-gnome/debian/changelog
	sflphone-common/debian/changelog
parents cee5af67 3b5a00e3
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment