Skip to content
GitLab
Explore
Sign in
Register
savoirfairelinux
jami-daemon
Repository
jami-daemon
sflphone-common
src
managerimpl.cpp
Find file
Blame
History
Permalink
Merge branch 'master' into m_savard
· a9685d37
Alexandre Savard
authored
Apr 19, 2010
Conflicts: sflphone-common/src/managerimpl.cpp
a9685d37