[nautilus: 2/2] Merge branch 'issue-36' into 'master'

[Gitlab Administrative User <gitlab src gnome org>]

commit b212d4a8792195552135987dfca4689a48f800ed
Merge: 046e9e852 a26384409
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Fri Nov 3 09:45:34 2017 +0000

    Merge branch 'issue-36' into 'master'
    
    Improve "Modified" datestamp for files from future
    
    See merge request GNOME/nautilus!7

 src/nautilus-file.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---