From 0212c0b85ffffbc62b475f14901f4242c4a108d2 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Wed, 9 Oct 2019 16:08:50 +0200 Subject: Merge pull request #1870 from JustAMan/fix-http-ex1 Fix exception when handling error, log errors better (cherry picked from commit d8d2e52e3ffaa59a32cc2cbb4997022b979f9ca0) Signed-off-by: Joshua Boniface --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index d78b0459d8..8ae5997258 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,5 @@ * text=auto eol=lf +*.png binary +*.jpg binary CONTRIBUTORS.md merge=union -- cgit v1.2.3