Commits
Maximiliano Garcia committed 4b7beb60339M
Merge branch 'develop' into feature/ui-transfer-attended # Conflicts: # web-softphone-main/public/locales/en/app.json # web-softphone-main/public/locales/es/app.json # web-softphone-main/src/app/components/App.js
