Fabian Faessler 844f08137c merge conflict again in models.py

2013-09-29 14:36:29 +02:00

..

_tests

…

migrations

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

2013-09-29 14:33:58 +02:00

templates/main

made home template and added admin link to nav

2013-09-29 14:08:22 +02:00

__init__.py

…

admin.py

added domain blacklisting

2013-09-29 14:10:14 +02:00

dnstools.py

…

forms.py

divided subdomain and domain (as FK)

2013-09-29 13:36:28 +02:00

models.py

merge conflict again in models.py

2013-09-29 14:36:29 +02:00

urls.py

removed proxy user, because solution was not working. Made id session based. please work now :'(

2013-09-29 14:33:24 +02:00

views.py

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

2013-09-29 14:33:58 +02:00