caratula Expediente
Merge branch 'master' of /home/ricardo/Documentos/mx.gob.dif.sinaris with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/layouts/main.gsp
	target/stacktrace.log
caratula Expediente