Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
isaak yansane-sisk
slapos
Repository
14eab6390e587ae7895894d935d9b3da881dfb21
Switch branch/tag
slapos
setup.py
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/erp5-generic' into kvm
· 14eab639
Romain Courteaud
authored
Jan 06, 2012
Conflicts: component/git/buildout.cfg
14eab639
setup.py
4.9 KB
Edit
Web IDE
Replace setup.py
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace setup.py
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
