Skip to content
Commit a0ffae99 authored by Etienne Lessard's avatar Etienne Lessard
Browse files

Merge branch '4716-snom-switchboard-plugin' 

Conflicts:
	plugins/xivo-snom/8.7.3.19/plugin-info
parents 2e033084 ca7b7a15
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment