Merge branch 'develop' into stable
This commit is contained in:
commit
e08b1feed0
2 changed files with 2 additions and 0 deletions
2
.gitattributes
vendored
2
.gitattributes
vendored
|
@ -1,2 +1,4 @@
|
|||
Force LF endings
|
||||
* eol=lf
|
||||
|
||||
*.png binary
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 800 KiB After Width: | Height: | Size: 800 KiB |
Loading…
Reference in a new issue