-
Emmanuel Milou authored
Merge branch 'master' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone Conflicts: sflphone-common/src/managerimpl.cpp
9e38ee2d
Merge branch 'master' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone Conflicts: sflphone-common/src/managerimpl.cpp