Skip to content
Snippets Groups Projects
Commit 476002a5 authored by Yun Liu's avatar Yun Liu
Browse files

Merge branch 'master' into yun-pjsip 

Conflicts:

	po/README
	po/sflphone.pot
parents 50fe4206 1ad38187
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1822 additions and 893 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