Commits
Maximiliano Garcia committed 0454c9e8687M
Merge branch 'develop' into feature/UI-answer # 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 # web-softphone-main/src/app/components/shared/styles/themeColors.scss # web-softphone-main/src/app/containers/App.js
