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

Merge branch 'yun-pjsip' of ssh://milou@192.168.1.203/home/yun/release/sflphone into sip_dev 

Conflicts:

	src/sipvoiplink.cpp
	src/useragent.cpp
parents 04b6e04b 04812921
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment