Browse Source

Merge branch '217-refatora-pesquisa-materia-django-filter' of https://github.com/interlegis/sapl into 217-refatora-pesquisa-materia-django-filter

Conflicts:
	materia/views.py

pull/282/head

Eduardo Calil 9 years ago

parent

579bf54d27 c449d4512d

commit

77045a906b

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available