Module configuration for Category, Tag and Cheat controllers. Not working yet... :(
Merge branch 'master' of https://github.com/agustincl/wpzf2
Changes in module.config made by other user, that overwrite mine
Nada. Eliminados un par de espacios
Cambioado .gitignore
Merge branch 'master' of https://github.com/agustincl/wpzf2
????
Album rest added
Merge branch 'master' of https://github.com/agustincl/wpzf2
Resueltos errores referentes a los test unitarios del módulo Contracts que se encontraban en el repositorio
Merge pull request #11 from anuf/master

Errores de otros módulos anteriores que estaban en el repositorio de agustinacl
...
Merge branch 'master' of https://github.com/agustincl/wpzf2

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/boleal/wpzf2

Conflicts:
	.gitignore