Learn more about cloning repositories
You have read-only access
Merge branch 'develop' into feature/calls-views # Conflicts: # web-softphone-main/src/app/actions/config.js # web-softphone-main/src/app/actions/softphone.js
