Skip to content
  • alision's avatar
    Merge branch 'master' into merge-upstream · aa76bfb7
    alision authored
    Conflicts:
    	daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp
    	daemon/src/audio/audiortp/audio_zrtp_session.cpp
    	daemon/src/audio/codecs/audiocodec.h
    	daemon/src/audio/codecs/audiocodecfactory.cpp
    	daemon/src/fileutils.cpp
    	daemon/src/history/history.cpp
    	daemon/src/managerimpl.cpp
    	daemon/src/managerimpl.h
    aa76bfb7