Merge remote-tracking branch 'master' into erp5testnode
Conflicts: software/erp5testnode/software.cfg
Showing
component/wget/buildout.cfg
0 → 100644
component/xorg/tmp_env.patch
0 → 100644
slapos/recipe/generatemac.py
0 → 100644
software/kvm/README.txt
0 → 100644
stack/nodejs.cfg
0 → 100644
Please register or sign in to comment