Merge branch 'master' into gitter-badge-1

Former-commit-id: 23f542f43b4b493e38f5aa4c29788ed93a63b43b [formerly 71b23a6a28eb045fcfeab6329de69f1e5455486b]
Former-commit-id: d12b3a6decc876f010a71f98e11df7387c1aaf2a
This commit is contained in:
Raul Jordan
2018-01-13 17:31:28 -05:00
committed by GitHub
3694 changed files with 714263 additions and 461545 deletions

2
.gitattributes vendored Normal file
View File

@@ -0,0 +1,2 @@
# Auto detect text files and perform LF normalization
* text=auto