-
Emmanuel Milou authored
Merge branch 'fonseca' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone into fonseca Conflicts: sflphone-common/src/managerimpl.cpp
03bc6ec8
Merge branch 'fonseca' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone into fonseca Conflicts: sflphone-common/src/managerimpl.cpp