Skip to content
Snippets Groups Projects
Commit a7c89e28 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'release' 

Conflicts:

	sflphone-client-gnome/debian/changelog
	sflphone-common/debian/changelog
parents 833be71d 8f5b2e1f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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