Merge with fe798654800bee1c7a8acb2c4a6c92b1bb5fcdca
authorcavaliet
Tue, 21 Jan 2014 12:04:12 +0100
changeset 292 5a996c029186
parent 291 5771b5d71208 (current diff)
parent 289 fe798654800b (diff)
child 293 9f3d4a926894
Merge with fe798654800bee1c7a8acb2c4a6c92b1bb5fcdca
--- a/.hgtags	Tue Jan 21 12:03:28 2014 +0100
+++ b/.hgtags	Tue Jan 21 12:04:12 2014 +0100
@@ -89,3 +89,7 @@
 0e35b7460395bc4c6e2d6df07422292a2f9b22cc V00.53
 0e35b7460395bc4c6e2d6df07422292a2f9b22cc V00.53
 e9cd436a7dcb9b456583ed97479a13b33e6d6118 V00.53
+e9cd436a7dcb9b456583ed97479a13b33e6d6118 V00.53
+1e7d890ec18eb331126ef0d647d576c50c11498c V00.53
+0000000000000000000000000000000000000000 V00.53
+fc58b798fe7594c460a169266fc0028dae20307e V00.53
--- a/src/jocondelab/__init__.py	Tue Jan 21 12:03:28 2014 +0100
+++ b/src/jocondelab/__init__.py	Tue Jan 21 12:04:12 2014 +0100
@@ -1,4 +1,4 @@
-VERSION = (0, 52, 0, "final", 0)
+VERSION = (0, 53, 0, "final", 0)
 
 
 def get_version():
--- a/src/jocondelab/config.py.tmpl	Tue Jan 21 12:03:28 2014 +0100
+++ b/src/jocondelab/config.py.tmpl	Tue Jan 21 12:04:12 2014 +0100
@@ -154,3 +154,4 @@
 }
 
 CACHE_MIDDLEWARE_SECONDS = 600
+HOME_CACHE_SECONDS = 30