Skip to content
GitLab
Commit 59fbe1f9 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files

Merge branch 'master' into vifib 

Conflicts:
	CHANGES.txt
	setup.py
	software/erp5/software.cfg
	software/erp5testnode/software.cfg
parents c28467be 34959dbd
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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