[nautilus: 2/2] Merge branch 'optional-tests' into 'master'

[Carlos Soriano <csoriano src gnome org>]

commit 5de22e0179f3edbf1fb3a39ae0e7f0f012d6f461
Merge: f7c4352ab 510a8303d
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Fri Mar 16 08:22:13 2018 +0000

    Merge branch 'optional-tests' into 'master'
    
    Allow not building tests
    
    See merge request GNOME/nautilus!143

 eel/meson.build            | 2 +-
 meson.build                | 4 +++-
 meson_options.txt          | 2 +-
 src/meson.build            | 2 +-
 test/automated/meson.build | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)
---