Admite 0 participantes
Creacion de ListaBusquedas
listaBusquedas.html creadas
cambios
Merge branch 'TakaraHunterAlfonso'

Conflicts:
	principal/models.py
Merge branch 'master' of https://github.com/jesusnoseq/TakaraHunter
Merge branch 'master' of github.com:jesusnoseq/TakaraHunter into ramajesusliana
mergeado