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
14eab6390e587ae7895894d935d9b3da881dfb21
Switch branch/tag
slapos
stack
erp5.cfg
Find file
Blame
History
Permalink
Merge remote-tracking branch 'upstream/erp5' into upstreamerp5generic
· 2f23e0c8
Romain Courteaud
authored
Dec 28, 2011
Conflicts: software/erp5/software.cfg
2f23e0c8
erp5.cfg
11.9 KB
Edit
Web IDE
Replace erp5.cfg
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace erp5.cfg
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
