[LyX/master] Merge branch 'master' of git.lyx.org:lyx

[José Matos]

commit 8663a371f31dc7bb888071c15a0b2cd4c3669c60
Merge: 3f03f0a 69726b8
Author: José Matos <jama...@lyx.org>
Date:   Sat Dec 29 19:24:59 2018 +0000

    Merge branch 'master' of git.lyx.org:lyx

 src/support/filetools.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)