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

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

Conflicts:

	sflphone-gtk/src/actions.c
parents fe9ec04f 2b2af4a2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 135 additions and 32 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