-
Simon Morlat authored
Conflicts: include/linphone/api/c-chat-room.h src/chat/chat-room/server-group-chat-room-p.h src/chat/chat-room/server-group-chat-room.cpp
ac655b58
Conflicts: include/linphone/api/c-chat-room.h src/chat/chat-room/server-group-chat-room-p.h src/chat/chat-room/server-group-chat-room.cpp