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