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
daemon
daemon.cc
Find file
Blame
History
Permalink
Merge branch 'daemon-dev'
· 67ea07bd
Sandrine Avakian
authored
Jan 02, 2017
# Conflicts: # daemon/commands/video.cc
67ea07bd