Commits
Maximiliano Garcia committed 4c280284fcbM
Merge branch 'develop' into feature/lookAndFeelChanges # Conflicts: # web-softphone-main/src/app/components/App.js # web-softphone-main/src/app/components/sidebar/Header.jsx # web-softphone-main/src/app/components/sidebar/sidebar.module.scss
