cambio zona horaria
cambio texto hora
CAMBIO NOMBRE BASE
sobreescritura de anibal!
commit
Merge branch 'master' of ssh://git@github.com/rianjara/Ing.Software.git

Conflicts:
	WebApplication/__pycache__/urls.cpython-33.pyc
	WebApplication/__pycache__/views.cpython-33.pyc
	WebApplication/settings.py
	WebApplication/urls.py
	WebApplication/views.py
sincronizado con anibal!
sincronizando con anibal!
Merge branch 'master' of ssh://git@github.com/rianjara/Ing.Software.git
Merge branch 'master' of ssh://git@github.com/rianjara/Ing.Software.git
actualizado con brick
ultima actualizacion
mostrar inventario
agregando info edgar!
ulti con anibal
Merge branch 'master' of https://github.com/rianjara/Ing.Software.git

Conflicts:
	WebApplication/DB_Optica.sqlite3
	WebApplication/urls.py
sincronizacon con master!
merge rianjara / master
#integracion con moduloInventario