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

Conflicts:
	nsupdate/main/urls.py

2013-09-29 02:08:39 +02:00

..

__init__.py

moved the /myip call into the api module

2013-09-28 18:46:31 +02:00

models.py

moved the /myip call into the api module

2013-09-28 18:46:31 +02:00

tests.py

moved the /myip call into the api module

2013-09-28 18:46:31 +02:00

views.py

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

2013-09-29 02:08:39 +02:00