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

Merge commit 'origin/release' into time_call 

Conflicts:

	sflphone-gtk/src/Makefile.am
	sflphone-gtk/src/calltree.c
parents 3330ab60 b205434c
No related branches found
No related tags found
No related merge requests 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