Commit fe51c666 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'gitattributes_ee_changelog_update' into 'master'

Update git attributes for changelog-ee

See merge request !337
parents 911649b6 0f579375
CHANGELOG merge=union CHANGELOG merge=union
\ No newline at end of file CHANGELOG-EE merge=union
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