Merge branch 'master' into tintou/i18n
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Fri, 12 Apr 2019 11:48:19 +0000 (13:48 +0200)
committerGitHub <noreply@github.com>
Fri, 12 Apr 2019 11:48:19 +0000 (13:48 +0200)
commit088b0817d819bf9a5c1faf12ca6b241d0e6d11b6
tree4231edc085f1ef390613332d800d54c78ddfe6b2
parentc75cb390ddaf680d1d7d9a0726717529efda43e6
parentb0c75723e27646ccd79b05e20c87dd5e3d890934
Merge branch 'master' into tintou/i18n