Skip to content
GitLab
Explore
Sign in
Register
savoirfairelinux
jami-daemon
Repository
jami-daemon
sflphone-client-gnome
src
actions.c
Find file
Blame
History
Permalink
Merge branch 'master' into jbonjean
· 6e8baecb
Julien Bonjean
authored
Oct 07, 2009
Conflicts: sflphone-common/src/sip/sipvoiplink.cpp
6e8baecb