Initial commit
Primer Commit
Merge branch 'master' of https://github.com/alpocr/meli
Primer Commit
Primer Commit
Merge branch 'master' of https://github.com/alpocr/meli

Conflicts:
	manage.py
modelos
Import os
Reparo errores
Cambios en Settings
Merge branch 'master' of https://github.com/alpocr/meli

Conflicts:
	meli/settings.py
	meli/settings.pyc
Implementacion de Registration
Update README.md
lib GCM
Interfaz Basica
Merge branch 'master' of https://github.com/alpocr/meli
Orden de Compra
s
s
Password field