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

Merge branch 'im' of ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into manu/im 

Conflicts:
	sflphone-client-gnome/src/imwindow.c
	sflphone-client-gnome/src/widget/imwidget.c
parents 05e42c66 45f2b6a0
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1188 additions and 1162 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