Skip to content
Snippets Groups Projects
Commit 2a99f4e2 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'master' of git.savoirfairelinux.com:sflphone-android 

Conflicts:
	jni/sflphone
parents f4cb9709 a6caa21a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 143 additions and 34 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