Merge branch 'master' into orm

# Conflicts:
#	docs/conf.py
This commit is contained in:
Ilan Steemers
2015-09-14 16:57:28 +02:00
3 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -9,6 +9,6 @@ from .models import Task, Schedule, Success, Failure
from .cluster import Cluster
from .status import Stat
VERSION = (0, 6, 3)
VERSION = (0, 6, 4)
default_app_config = 'django_q.apps.DjangoQConfig'