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
Kasra Jamshidi
slapos
Repository
725d94d769657e15e02a7852317b14092be737fd
Switch branch/tag
slapos
setup.py
Find file
Blame
History
Permalink
Merge branch 'master' into erp5-cluster
· a78c821b
Julien Muchembled
authored
Nov 21, 2014
Conflicts: stack/erp5/buildout.cfg
a78c821b
setup.py
11.6 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.
