Merge branch 'master' into 965-file-folder-ignored-as-info
authorCamila Ayres <hello@camila.codes>
Mon, 22 Jul 2019 13:44:10 +0000 (15:44 +0200)
committerGitHub <noreply@github.com>
Mon, 22 Jul 2019 13:44:10 +0000 (15:44 +0200)

Trivial merge