diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-03-21 09:14:03 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-03-21 09:15:32 +0000 |
| commit | d81b5c5e4f71e85ae94b162e4691b8478e3712b2 (patch) | |
| tree | 2f2a12bee00a88a579567aa74b3262201cdea23d /ChangeLog | |
| parent | 2bf2c409730da51e4dde58e3d0918319715db7d7 (diff) | |
Merge.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1,4 +1,12 @@ +<<<<<<< HEAD 2018-03-14 Carl Hetherington <cth@carlh.net> +======= +2018-03-21 Carl Hetherington <cth@carlh.net> + + * Updated nl_NL translation from Rob van Nieuwkerk. + +2018-03-19 Carl Hetherington <cth@carlh.net> +>>>>>>> 15f3ff4... Updated nl_NL translation from Rob van Nieuwkerk. * Better error when loading a non-certificate as a certificate. |