Browse Source

HOT-FIX: Fix migrações na master

pull/2995/head
Cesar Carvalho 5 years ago
parent
commit
c0e6f3e41e
  1. 2
      sapl/base/views.py
  2. 2
      sapl/protocoloadm/migrations/0024_merge_20190821_1418.py

2
sapl/base/views.py

@ -56,7 +56,7 @@ from sapl.parlamentares.models import (Parlamentar, Legislatura, Mandato, Filiac
from sapl.protocoloadm.models import (Protocolo, TipoDocumentoAdministrativo,
StatusTramitacaoAdministrativo,
DocumentoAdministrativo, Anexado)
from sapl.sessao.models import (Bancada, PresencaOrdemDia, SessaoPlenaria, OrdemDia,
from sapl.sessao.models import (PresencaOrdemDia, SessaoPlenaria, OrdemDia,
SessaoPlenariaPresenca, TipoSessaoPlenaria)
from sapl.utils import (parlamentares_ativos, gerar_hash_arquivo, SEPARADOR_HASH_PROPOSICAO,
show_results_filter_set, mail_service_configured,

2
sapl/protocoloadm/migrations/0024_merge_20190821_1418.py

@ -9,7 +9,7 @@ class Migration(migrations.Migration):
dependencies = [
('protocoloadm', '0023_auto_20190711_1755'),
('protocoloadm', '0023_merge_20190802_1112'),
('protocoloadm', '0023_merge_20190802_1117'),
]
operations = [

Loading…
Cancel
Save