Commits
Agustin Griguol committed 3e86fa0379cM
Merge branch 'develop' into feature/calls-incommings # Conflicts: # web-softphone-main/src/app/actions/softphone.js # web-softphone-main/src/app/components/App.js # web-softphone-main/src/app/containers/App.js # web-softphone-main/src/app/store/middlewares/softphone.js
