Browse Source

Merge branch '316-login-simples' of https://github.com/interlegis/sapl into 316-login-simples

Conflicts:
	base/forms.py
	base/tests/test_login.py
	base/tests/teststub_urls.py
	templates/base.html
	templates/base/login.html
pull/328/head
Eduardo Calil 10 years ago
parent
commit
3361ce92a5

Diff Content Not Available