Merge branch 'master' into develop
This commit is contained in:
commit
38aae749a3
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -1 +1,3 @@
|
||||
* text=auto
|
||||
public/* linguist-vendored=false
|
||||
resources/assets/* linguist-vendored=false
|
||||
|
||||
Loading…
Reference in New Issue
Block a user