Commit 5035992c authored by jehan's avatar jehan
Browse files

Merge remote-tracking branch 'private/dev_lime'

Conflicts:
	coreapi/linphonecall.c
parents 0f23b27e 71328f9f
No related merge requests found
Showing with 1391 additions and 44 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