Merge branch 'general-devel' into h/ips
This commit is contained in:
commit
d8512b842c
1 changed files with 1 additions and 0 deletions
1
.gitattributes
vendored
1
.gitattributes
vendored
|
|
@ -3,3 +3,4 @@
|
|||
*.sln text eol=crlf
|
||||
*.csproj text eol=crlf
|
||||
*.vsmdi text eol=crlf
|
||||
CHANGELOG.md merge=union
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue