Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kasra Jamshidi
slapos
Repository
14eab6390e587ae7895894d935d9b3da881dfb21
Switch branch/tag
slapos
software
erp5
instance-erp5-development.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
instance-erp5-development.cfg
3.81 KB
Edit
Web IDE
Replace instance-erp5-development.cfg
×
Attach a file by drag & drop or
click to upload
Commit message
Replace instance-erp5-development.cfg
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
