Delete sftp-config.json
Delete wp-config.php
Delete wp-config_CDEC.php
actualización nuevos cambios home CDEC
actualización nuevos cambios home CDEC
ok
Merge branch 'master' into Jorge
Cambios home
mailing
Merge commit '80cf946c709722568bba9931160ea64e7079e3f4' into max

Conflicts Resolve:
	nbproject/private/private.properties