[nautilus: 3/3] Merge branch 'patch-3' into 'master'

[Gitlab Administrative User <gitlab src gnome org>]

commit 04ab4cbe0681c225d1ea2965bde8565ccfab90fa
Merge: 0e2330e7c 9ec56a2d4
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Fri Nov 3 16:16:57 2017 +0000

    Merge branch 'patch-3' into 'master'
    
    Never sort search results with directories above files, regardless of the setting.
    
    See merge request GNOME/nautilus!13

 src/nautilus-files-view.c | 4 +++-
 src/nautilus-list-view.c  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---