Commit graph

1 commit

Author SHA1 Message Date
Margaux Clerc
c3072beae1 Merge remote-tracking branch 'private/3.0.X' into obiane
Conflicts:
	src/org/linphone/CallActivity.java
2015-11-09 14:16:42 +01:00