Skip to content
Snippets Groups Projects
Commit 7d986a7a authored by Alexandre Savard's avatar Alexandre Savard
Browse files
Conflicts:
	sflphone-common/src/sip/im/InstantMessaging.h
parents 8a7ea137 fbe56cc9
No related branches found
No related tags found
No related merge requests found
Showing
with 522 additions and 295 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment