Skip to content
GitLab
Explore
Sign in
Register
savoirfairelinux
jami-daemon
Repository
jami-daemon
src
managerimpl.cpp
Find file
Blame
History
Permalink
Merge branch 'master' into cleanup
· 1d47ab18
Emmanuel Milou
authored
Jan 16, 2009
Conflicts: src/managerimpl.cpp src/useragent.cpp src/voiplink.cpp src/voiplink.h
1d47ab18