CHANGES.txt · a17c7c92d93b78f3df933b33b785d702c7bb1fe4 · Justin / slapos.toolbox · GitLab

Find file Blame History Permalink

Merge branch 'master' into slaprunner · a17c7c92
Cédric de Saint Martin authored Jul 06, 2012
```
Conflicts:
	CHANGES.txt
	setup.py
```
a17c7c92

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

CHANGES.txt 3.82 KB