diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-06 10:11:24 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-06 10:11:24 +0200 |
| commit | f90b5d5d438e77a6e849f1cc2a3b27fd1dac7ec4 (patch) | |
| tree | 42761eaa48b4c80ef6fce0d409eaee803dfc8ad0 /doc/gitlab-basics | |
| parent | 66a9511b5245d3bd701b7246b4dafe4851159733 (diff) | |
| download | gitlab-ce-f90b5d5d438e77a6e849f1cc2a3b27fd1dac7ec4.tar.gz | |
Fix CHANGELOG and wrong conflict resolution
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'doc/gitlab-basics')
0 files changed, 0 insertions, 0 deletions