Merge branch 'master' into develop
This commit is contained in:
commit
da6fc175fb
|
@ -1,3 +1,3 @@
|
||||||
* text=auto
|
* text=auto
|
||||||
public/* linguist-vendored=false
|
*.css linguist-vendored=false
|
||||||
resources/assets/* linguist-vendored=false
|
*.less linguist-vendored=false
|
||||||
|
|
Loading…
Reference in New Issue