Skip to content
GitLab
Explore
Sign in
Register
savoirfairelinux
jami-daemon
Repository
jami-daemon
daemon
src
account.h
Find file
Blame
History
Permalink
Merge branch 'master' of
http://git.sflphone.org/sflphone
into video_preview
· 7f1d6c40
Tristan Matthews
authored
Jun 01, 2012
Resolved Conflicts: daemon/src/sip/sdp.cpp gnome/src/main.c
7f1d6c40