Skip to content
GitLab
Explore
Sign in
Register
savoirfairelinux
jami-daemon
Repository
jami-daemon
src
managerimpl.cpp
Find file
Blame
History
Permalink
Merge commit 'origin/master' into dbus
· fb081475
Pierre-Luc Beaudoin
authored
Sep 07, 2007
Conflicts: .gitignore src/Makefile.am src/managerimpl.cpp
fb081475