Merge remote-tracking branch 'origin/erp5-generic' into deployment_generic_CR1094

Conflicts: software/erp5/software.cfg

Merge remote-tracking branch 'origin/erp5-generic' into deployment_generic_CR1094
Conflicts: software/erp5/software.cfg
4f526c70 · Romain Courteaud · b442860f · 77e850a8 · 4f526c70
Commit 4f526c70 authored Jan 11, 2012 by Romain Courteaud
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

software/erp5/software.cfg software/erp5/software.cfg +1 -1

No files found.
--- a/software/erp5/software.cfg
+++ b/software/erp5/software.cfg
@@ -75,7 +75,7 @@ mode = 0644
 [template-zope]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-zope.cfg
-md5sum = 0f51d0e024b5d33b95325f719869e923
+md5sum = f4d8a1c73a43488ef160d92b7f08db8b
 output = ${buildout:directory}/template-zope.cfg
 mode = 0644