a

a

Revert "Revert "Merge remote-tracking branch 'origin/master'""

This
reverts commit cc8a1c63c2250c4511a7d54be37d6595ea31e8c0.

Revert "Merge remote-tracking branch 'origin/master'"

This reverts
commit 718860473e33159d8f08d5a62cf90c59e1085776.

Revert "Revert "Merge remote-tracking branch 'origin/master'""

This
reverts commit 1f246f75326e3007a2b8e92e2093db6fb3bc05dc.

Revert "Merge remote-tracking branch 'origin/master'"

This reverts
commit 718860473e33159d8f08d5a62cf90c59e1085776.

Merge remote-tracking branch
'origin/master'

Conflicts:
	scripts/conexion.php
	scripts/conexion2.php

cambiando
string de conexion
a

a