Denwa Softphone / dnw-softphone-desktop / b2853ab983e

Commits

Maximiliano Garcia committed b2853ab983eM16 jul 2020

Merge branch 'develop' into feature/dialpad

# Conflicts:
#	web-softphone-main/src/app/components/App.js
#	web-softphone-main/src/app/components/dialpad/Dialpad.jsx

Showing diff tof7c4ffddb4e