Merge branch 'matthiasc/for-master' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Fri, 22 May 2020 20:59:44 +0000 (20:59 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 22 May 2020 20:59:44 +0000 (20:59 +0000)
text: Avoid clash of preedit and placeholder

See merge request GNOME/gtk!1955


Trivial merge