enderal/enderalse
1
Fork 0
Code Releases Activity

Merge branch 'merging' into development

Browse Source 
# Conflicts:
#	.gitattributes
This commit is contained in:
Eddoursul 2021-10-12 07:25:50 +02:00
parent a5504bfaa6
commit 876cc15a9b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -26,5 +26,4 @@
*.props filter= diff= merge= text eol=crlf
*.inl filter= diff= merge= text eol=crlf
*.flm filter= diff= merge= text eol=crlf
*.dlstrings filter= diff= merge= -text
translate_*.txt filter= diff= merge= -text