Merge branch 'ArcNexus' of https://github.com/arcnexus/RedFoX.git into Ladis
Merge branch 'master' into Ladis
CAjas
Cajas
Merge branch 'master' into Ladis
Merge branch 'master' of https://github.com/arcnexus/RedFoX.git

Conflicts:
	Maya.pro
Cambio init de frmarticulos
frmclientes::init + init_querys
Autocompletado de poblaciones en Cientes
Poblaciones.sqlite: pegar en /poblaciones/ dento de la carpeta del build/exe
Merge branch 'master' of github.com:arcnexus/RedFoX
Merge branch 'ArcNexus'
Fix merge