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

Merge branch 'rc2' into release 

Conflicts:

	sflphone-common/po/de.po
	sflphone-common/po/es.po
	sflphone-common/po/ru.po
	sflphone-common/po/zh_CN.po
	sflphone-common/po/zh_HK.po
parents b92c2fd9 df19ab8e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1042 additions and 853 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