-
Tristan Matthews authored
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview Resolved Conflicts: gnome/src/config/audioconf.c
3dcfc821
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview Resolved Conflicts: gnome/src/config/audioconf.c