Merge branch 'master' into 6.0
This commit is contained in:
commit
83f306634d
|
|
@ -1,7 +1,6 @@
|
|||
* text=auto
|
||||
|
||||
/docs export-ignore
|
||||
/examples export-ignore
|
||||
/test export-ignore
|
||||
/.gitattributes export-ignore
|
||||
/.gitignore export-ignore
|
||||
|
|
|
|||
Loading…
Reference in New Issue