Merge branch 'desarrollo'
version 2.2 con iconos personalizables
Merge branch 'desarrollo'
version 2.2
Merge branch 'desarrollo'
hotfix 2.2
Merge branch 'desarrollo'
typo fix
Merge branch 'desarrollo'
release v2.3
Merge branch 'master' into desarrollo