Skip to content
GitLab
Find file BlameHistoryPermalink
  • Simon Morlat's avatar
    Merge branch 'dev_conference' · 6d0b58eb
    Simon Morlat authored 
    Conflicts:
	coreapi/linphonecall.c
	coreapi/linphonecore.c
	java/common/org/linphone/core/LinphoneCall.java
	mediastreamer2
    6d0b58eb