diff options
| author | Maxime Biais <maxime.biais@gmail.com> | 2014-08-01 12:51:29 +0200 |
|---|---|---|
| committer | Maxime Biais <maxime.biais@gmail.com> | 2014-08-01 12:51:29 +0200 |
| commit | ecb5fe3a1d10635b8db9a59f3ed881487b80b1e0 (patch) | |
| tree | 04593bde883cae0651b4e46a6995098db62624c6 /.gitattributes | |
| parent | 68a03deae8dc71d01a342a2ea06654c6dbfc322c (diff) | |
| parent | 813f9d738d4b45789bc7e370808df4a030cb9761 (diff) | |
| download | gradle-perf-android-medium-ecb5fe3a1d10635b8db9a59f3ed881487b80b1e0.tar.gz | |
Merge branch 'release/3.0' into develop
Conflicts:
.gitattributes
build.gradle
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 3047fbd31..916cac193 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ * text=auto !eol +*.sh text eol=lf *.bat text eol=crlf *.png binary *.jpg binary |