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

4
.gitignore vendored
View File

@@ -4,6 +4,6 @@
django/
registration/
dbsettings.py
django_cron
django_evolution
piston
django_evolution
logs/