[glib: 2/2] Merge branch '2082-get-rid-of-am-pm' into 'master'

[Sebastian Dröge <sdroege src gnome org>]

commit bc2bfdfa4367269272539e61fb7e87eb4e6ea55f
Merge: 700be9f22 6e3b1e069
Author: Sebastian Dröge <slomo coaxion net>
Date:   Thu May 14 15:07:12 2020 +0000

    Merge branch '2082-get-rid-of-am-pm' into 'master'
    
    gdatetime: Document that specific AM/PM formatting is discouraged
    
    Closes #2082
    
    See merge request GNOME/glib!1445

 glib/gdatetime.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
---