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

Merge branch 'rc1' into pierre-luc

Conflicts:
	sflphone-client-kde/po/ru/sflphone-client-kde.po
parents c3e3f6a2 d4354b7d
No related branches found
No related tags found
No related merge requests found
Showing
with 2024 additions and 911 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment