Skip to content
GitLab
Explore
Sign in
Register
nexedi
slapos
Repository
slapos
setup.py
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/accords'
· 77db41ff
Cédric de Saint Martin
authored
Aug 20, 2014
Conflicts: component/automake/buildout.cfg component/ca-certificates/buildout.cfg setup.py
77db41ff