diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-07-20 17:28:43 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-07-20 17:28:43 +0000 |
| commit | 57f9a1ccd4e97747cf09ffd98e8c44056c0846e5 (patch) | |
| tree | 196505344ead2f6680da884756a1ff418fcf74d1 /doc/gitlab-basics | |
| parent | e8c147903b55fda14f503adf7efcf0b69c54fe67 (diff) | |
| parent | e252410058a5aab0cb0427aeb0768b19b0fce4de (diff) | |
| download | gitlab-ce-57f9a1ccd4e97747cf09ffd98e8c44056c0846e5.tar.gz | |
Merge branch 'fix-changelog-7.11-7.12' into 'master'
Fix change log for 7.11 and move entry to 7.12
The change log for 7.11 was accidentally split in
3865a1d92585cb31864b5d0f1b325c3585b5c681. Additionally, the change added
with this commit did not make it into 7.11 according to
`git branch --contains` and it has not been cherry picked to 7-11-stable
so the entry is moved to 7.12.
Refs GH-5625, GH-9318.
See merge request !1009
Diffstat (limited to 'doc/gitlab-basics')
0 files changed, 0 insertions, 0 deletions