fix
Merge branch 'master' of https://github.com/tagercito/vacas

Conflicts:
	source/contabilidad/admin.py