Merge branch 'release/v1.0' into dev
Merge branch 'hotfix/description' into dev
cambios del cliente
asd
fix hash url problem
paypal email
asd
asd
merge dev