Home Explore Help
Sign In
yangck
/
celery
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'apollo13/master' into 1point0

Conflicts:
	docs/configuration.rst
	docs/cookbook/tasks.rst
Ask Solem 15 years ago
parent
3f67e2fb11 4160cc0443
commit
653bc87039
1 changed files with 0 additions and 2 deletions
Unified View Show Diff Stats
  1. 0 2
      docs/configuration.rst

+ 0 - 2
docs/configuration.rst
View File 

@@ -81,8 +81,6 @@ Task result backend settings
 
 .. _`Redis`: http://code.google.com/p/redis/
 
 .. _`Redis`: http://code.google.com/p/redis/
 
 .. _`Tokyo Tyrant`: http://1978th.net/tokyotyrant/
 
 .. _`Tokyo Tyrant`: http://1978th.net/tokyotyrant/
 
 
 
-
 
-
 
 Database backend settings
 
 Database backend settings
 
 =========================
 
 =========================