maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable union merges for translations (#15061)

Browse source
This commit is contained in:
Michael Kohl 2021-10-14 10:51:09 +07:00 • committed by GitHub
parent 0b8338f2c6
commit d20337281b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored
View file

@ -9,3 +9,4 @@
*.html diff=html
*.erb diff=html
/CHANGELOG.md merge=union
config/locales/*.yml merge=union