Skip to content
GitLab
Explore
Sign in
Register
nexedi
slapos
Repository
slapos
software
cloudooo
software.cfg
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/master' into slapos-testing
· 962aff92
Cédric de Saint Martin
authored
Sep 06, 2012
Conflicts: setup.py
962aff92
