Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
liblinphone
Repository
liblinphone
coreapi
linphonecore_jni.cc
Find file
Blame
History
Permalink
Merge branch 'master' into dev_vcard
· 3835ab26
Sylvain Berfini
authored
Jan 12, 2016
Conflicts: coreapi/friendlist.c
3835ab26