bareos: master 3790ade7

Author Committer Branch Timestamp Parent
pstorz GitHub master 2022-02-04 12:54 master 746e7a10 Pending
Changeset Merge pull request 0001062 from arogge/dev/arogge/master/changelog-union-merge

git: set merge strategy for `CHANGELOG.md` to `union`
add - .gitattributes Diff File
mod - CHANGELOG.md Diff File