diff options
| author | Marco Vito Moscaritolo <mavimo@gmail.com> | 2015-03-30 18:17:41 +0200 |
|---|---|---|
| committer | Marco Vito Moscaritolo <mavimo@gmail.com> | 2015-03-30 18:17:41 +0200 |
| commit | 718661f9aa4bfe9e767f2e49880bd3774499e3d2 (patch) | |
| tree | 2da9a45bfb375ec0243cd52f84940e11b05d2b7b /lib/api/files.rb | |
| parent | 43a680b9e9c9c0a063777c336c2ef75aece4fe05 (diff) | |
| download | gitlab-ce-718661f9aa4bfe9e767f2e49880bd3774499e3d2.tar.gz | |
Fix merge errors on CHANGELOG
During merges (d554070a and 497fd75d) changelog was "damaged", I restored the tagged 7.9.1 and added the required changes about 7.10.0 (unreleased). I think we need to ensure all PR are rebased on master before merge.
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions