Merge branch 'master' into tintou/i18n
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Fri, 12 Apr 2019 08:35:02 +0000 (10:35 +0200)
committerGitHub <noreply@github.com>
Fri, 12 Apr 2019 08:35:02 +0000 (10:35 +0200)
commitc75cb390ddaf680d1d7d9a0726717529efda43e6
tree0408002279f89072d9c31d7d8ae0afc33b725933
parent1ea8b18893bde316a4de3c1d925d64e3a5365b56
parentd39f826e0ebd8d496ccefb0b8a63ae08e96bb7f7
Merge branch 'master' into tintou/i18n