mirror of
https://github.com/saltstack/salt.git
synced 2025-04-07 04:51:38 +00:00
938218326c
- Add all PRs/issues to CHANGELOG.md
- Add gitattributes merge=union for CHANGELOG.md
This should avoid most merge conflicts
- Try merge=union for release notes
- Remove dupes from changelog
- Update credits and add chroot to releasenotes
- Remove bad releasenotes info
As a result of porting to master there were extra bits of information
that got in before the actual changes. These have been removed.
2 lines
59 B
Text
2 lines
59 B
Text
CHANGELOG.md merge=union
|
|
docs/topics/release/* merge=union
|