Skip to content
Snippets Groups Projects
Commit aae4b18c authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'sip_dev' into stable

Conflicts:

	src/managerimpl.h
parents b4082cb0 10363d5b
Branches
Tags
No related merge requests found
Showing
with 1200 additions and 717 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment