summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-11-16 11:36:27 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-11-16 11:36:27 +0000
commit05be65f3731ebbe569c51a78ef72e30bf26aa8d0 (patch)
treecc2531602d556fbe551010825e7cb5c53502a790 /spec
parent0a3cafb2895bef3577e2b9ca09c4eb8bdb8565fa (diff)
parent59189438388191c044c0697d5bfb571693d95978 (diff)
downloadgitlab-ce-05be65f3731ebbe569c51a78ef72e30bf26aa8d0.tar.gz
Merge branch 'rs-disable-changelog-merge' into 'master'
Remove gitattribute entry for CHANGELOG.md This should no longer be necessary now that we've got automatic changelogs! See merge request !7479
Diffstat (limited to 'spec')
0 files changed, 0 insertions, 0 deletions