[glib: 2/2] Merge branch '811-content-type-docs' into 'master'

[Christoph Reiter <creiter src gnome org>]

commit fded2090e2892cbd5f4a92c6f8fb27b798adcf8f
Merge: 54498aa7a 6775fe255
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Tue Jun 12 08:52:56 2018 +0000

    Merge branch '811-content-type-docs' into 'master'
    
    docs: Add (transfer full) annotation to g_content_type_get_mime_type()
    
    Closes #811
    
    See merge request GNOME/glib!84

 gio/gcontenttype.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---