[nautilus: 2/2] Merge branch 'AlexFazakas/group-links-with-files' into 'master'

[Carlos Soriano <csoriano src gnome org>]

commit f7c4352ab8e40e0fadaddca92bc7f01565b912d8
Merge: 0188cefe8 4dcc2e700
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Thu Mar 15 20:38:56 2018 +0000

    Merge branch 'AlexFazakas/group-links-with-files' into 'master'
    
    file: Group TYPE and link to TYPE together when sorting
    
    See merge request GNOME/nautilus!140

 src/nautilus-file.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)
---