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
linphonefriend.h
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/master' into dev_vcard
· a0076b7d
Sylvain Berfini
authored
Dec 18, 2015
Conflicts: coreapi/friend.c coreapi/private.h
a0076b7d