Arne Schauf 9be82a5d01 Merge branch 'master' of github.com:asmaps/nsupdate.info ...

Conflicts:
	nsupdate/main/views.py

2013-09-28 16:56:53 +02:00

..

_tests

tests: use relative imports, make tests a package

2013-09-28 15:56:35 +02:00

templates/main

Merge branch 'master' of github.com:asmaps/nsupdate.info

2013-09-28 16:47:54 +02:00

__init__.py

requirements fix and basic django project

2013-09-28 10:44:29 +02:00

dnstools.py

Merge branch 'master' of github.com:asmaps/nsupdate.info

2013-09-28 15:44:21 +02:00

models.py

requirements fix and basic django project

2013-09-28 10:44:29 +02:00

urls.py

profile and password change.

2013-09-28 16:46:33 +02:00

views.py

Merge branch 'master' of github.com:asmaps/nsupdate.info

2013-09-28 16:56:53 +02:00