From: Carl Hetherington <cth@carlh.net>
Date: Mon, 4 Jun 2018 10:13:38 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.13.26~2
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ab1c8a67afba072b1c29f0c3c34aa9779643e66a

Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
---

ab1c8a67afba072b1c29f0c3c34aa9779643e66a
diff --cc ChangeLog
index 186d614de,aff3175a1..4d3741eeb
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,11 @@@
+ 2018-05-29  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Updated fr_FR translation from Thierry Journet.
+ 
  2018-05-27  Carl Hetherington  <cth@carlh.net>
  
 +	* Support notifications on jobs finishing (#1286).
 +
  	* Updated it_IT translation from Felice D'Andrea.
  
  2018-05-23  Carl Hetherington  <cth@carlh.net>