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
Sebastien Robin
slapos
Repository
4f526c702d64cb38ffb6ba6529184a1adde7fcbd
Switch branch/tag
slapos
software
erp5
software.cfg
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/erp5-generic' into deployment_generic_CR1094
· 4f526c70
Romain Courteaud
authored
Jan 11, 2012
Conflicts: software/erp5/software.cfg
4f526c70
software.cfg
10.5 KB
Edit
Web IDE
Replace software.cfg
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace software.cfg
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.