Commit 05be65f3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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
CHANGELOG.md merge=union
*.js.es6 gitlab-language=javascript
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment