Skip to content

slapos
slapos
Commit dff41c01 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

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

Conflicts:
	software/erp5/software.cfg
parents 8b230272 d8a84110
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
software/erp5/software.cfg
View file @ dff41c01
...@@ -75,7 +75,7 @@ mode = 0644 ...@@ -75,7 +75,7 @@ mode = 0644
[template-zope] [template-zope]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-zope.cfg url = ${:_profile_base_location_}/instance-zope.cfg
md5sum = f4d8a1c73a43488ef160d92b7f08db8b md5sum = ff93a87778520a3c7ce0d7bda93e25cc
output = ${buildout:directory}/template-zope.cfg output = ${buildout:directory}/template-zope.cfg
mode = 0644 mode = 0644
...@@ -145,7 +145,7 @@ mode = 0644 ...@@ -145,7 +145,7 @@ mode = 0644
[template-snippet-zope] [template-snippet-zope]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/snippet-zope.cfg url = ${:_profile_base_location_}/snippet-zope.cfg
md5sum = ff93a87778520a3c7ce0d7bda93e25cc md5sum = cca86232d644f0050f1f96c270867852
output = ${buildout:directory}/template-snippet-zope.cfg output = ${buildout:directory}/template-snippet-zope.cfg
mode = 0644 mode = 0644
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7