[nautilus: 2/2] Merge branch 'alexpandelea/issue65' into 'master'

[Gitlab Administrative User <gitlab src gnome org>]

commit 9ad049def786c335c142a39a9d431804df1bccb6
Merge: 04ab4cbe0 d33960cd1
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Fri Nov 3 16:55:54 2017 +0000

    Merge branch 'alexpandelea/issue65' into 'master'
    
    remove setting fts from preference dialog
    
    See merge request GNOME/nautilus!14

 data/org.gnome.nautilus.gschema.xml             |  2 +-
 src/nautilus-global-preferences.h               |  4 ++--
 src/nautilus-preferences-window.c               |  5 -----
 src/nautilus-search-popover.c                   |  5 ++++-
 src/resources/ui/nautilus-preferences-window.ui | 30 -------------------------
 5 files changed, 7 insertions(+), 39 deletions(-)
---