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)
commit4efa282f80f90cd93ac62a703ad36d32399588c0
tree5b471a0903c03bb7dede395071d5202cfee1664e
parentbd2514439073614e4ef01f72456bc3e54f9b3e58
parentd53cfbd9fb2028bf2ea1de50286df2af131edbea
Merge branch 'master' into issue_1351
src/gui/folder.cpp