update
This commit is contained in:
parent
421d59ce0a
commit
a038d778ef
4
.gitattributes
vendored
4
.gitattributes
vendored
@ -1 +1,3 @@
|
|||||||
*.po merge=ours
|
*.po merge=ours
|
||||||
|
.gitignore merge=ours
|
||||||
|
.gitmodules merge=ours
|
Loading…
Reference in New Issue
Block a user