Browse Source

Merge branch 'apollo13/master' into 1point0

Conflicts:
	docs/configuration.rst
	docs/cookbook/tasks.rst
Ask Solem 15 years ago
parent
commit
653bc87039
1 changed files with 0 additions and 2 deletions
  1. 0 2
      docs/configuration.rst

+ 0 - 2
docs/configuration.rst

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