CHANGES.txt · 59fbe1f929d4fc58a0954368d61cbfaf58eb9387 · Lukas Niegsch / slapos · GitLab

Find file Blame History Permalink

Merge branch 'master' into vifib · 59fbe1f9

Łukasz Nowak authored Jun 13, 2011

Conflicts:
	CHANGES.txt
	setup.py
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

59fbe1f9

To find the state of this project's repository at the time of any of these versions, check out the tags.

CHANGES.txt 1.04 KB