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
Yusei Tahara
slapos
Repository
9a957e20f5ae65f6841dbdf9731ed2a72a66c926
Switch branch/tag
slapos
setup.py
Find file
Blame
History
Permalink
Merge remote-tracking branch 'upstream/erp5-generic' into deployment_generic_CR1094
· 9a957e20
Romain Courteaud
authored
Dec 28, 2011
Conflicts: setup.py software/erp5/software.cfg
9a957e20
setup.py
4.64 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.
