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

Merge branch 'po'

Conflicts:
	sflphone-client-gnome/src/accountlist.c
	sflphone-client-kde/po/sflphone-client-kde.pot
parents 65e60ba8 fee25230
No related branches found
No related tags found
No related merge requests found
Showing
with 13774 additions and 45 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment