Bring piston-api up to current master

Conflicts:

	.gitignore
	urls.py
This commit is contained in:
2010-04-14 12:55:18 +01:00
197 changed files with 9636 additions and 6559 deletions

View File

@@ -1,6 +1,5 @@
#!/bin/sh
svn checkout http://django-registration.googlecode.com/svn/trunk/registration
svn co http://code.djangoproject.com/svn/django/branches/releases/1.1.X/django django
svn co http://django-evolution.googlecode.com/svn/trunk/django_evolution
hg clone http://bitbucket.org/jespern/django-piston/