DetallesHtml
DetallesHtml
DetallesHtml
DetallesHtml
DetallesHtml
DetallesHtml
DetallesHtml
Obss
DetallesHtml
Merge remote-tracking branch 'origin/permisos_seteados' into permisos_seteados
DetallesHtml
DetallesHtml
DetallesHtml
DetallesHtml
Merge branch 'permisos_seteados'

Conflicts:
	.idea/CRF_Project.iml
	.idea/misc.xml
	Sigma_System/vistas/ItemViews.py
	templates/AdministrarItem.html
	templates/AltaItems.html
	templates/AsignarUsuario.html
DetallesHtml