Fabian Faessler 844f08137c merge conflict again in models.py

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

..

accounts

pep8 fixes

2013-09-29 01:23:27 +02:00

api

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

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

main

merge conflict again in models.py

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

nsupdate

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

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

__init__.py

make the toplevel nsupdate dir a package

2013-09-28 17:26:11 +02:00

manage.py

fixed different width in templates

2013-09-29 00:28:31 +02:00