Merge branch 'master' into issue_1351
authorCamila Ayres <hello@camila.codes>
Mon, 4 Nov 2019 21:48:07 +0000 (22:48 +0100)
committerGitHub <noreply@github.com>
Mon, 4 Nov 2019 21:48:07 +0000 (22:48 +0100)
1  2 
src/gui/folder.cpp

Simple merge