Skip to content
Snippets Groups Projects
Commit 7a8960ff authored by Jérémy Quentin's avatar Jérémy Quentin
Browse files

Merge branch 'codeclistmodel' into qt-client

Conflicts:
	sflphone-client-kde/po/ru/sflphone-client-kde.po
parents e5ec7909 3aaf3fef
No related branches found
No related tags found
No related merge requests found
Showing
with 2469 additions and 1043 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment