Skip to content

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

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

Conflicts:
	software/erp5/software.cfg
	stack/erp5.cfg
parents 6c1d891d 22fda534
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
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