Resolucao do item 21
Resolucao do item 21
OSI_FS0004 - Item 30 Alteracao referente as listas
Merge branch 'develop' of https://github.com/andrethomazini/siga into develop
Resolucao do item 21
Resolucao do item 21
Resolucao do item 21
OS_FS0008 - Item 19 Aprimoramento do cadastro de Pendências.
Merge branch 'develop' of https://github.com/andrethomazini/siga into develop

Conflicts:
	sigasr/app/models/SrSolicitacao.java
Resolucao do item 21
Tentando ajustar nome de email do commit
Revert porque o merge automatico retirou funcionalidades do item 19
OSI_FS0004 - Item 39 Substituindo classes por mapeamentos do JPA
Merge branch 'develop' of https://github.com/andrethomazini/siga into develop
OSI_FS0004 - Item 26 Desativando ordenacao na tabela
Merge branch 'develop' of https://github.com/andrethomazini/siga into SigaSrDB1

Conflicts:
	sigasr/app/controllers/Application.java
	sigasr/app/db/migration/SIGASR_UTF8_V00000000000000000016.sql
	sigasr/app/models/SrConfiguracaoBL.java
	sigasr/app/models/SrSolicitacao.java
	sigasr/app/views/Application/editar.html