Merge branch 'wip/rishi/issue-1073' into 'master'61ccf733ccf1f64760553f6915fc7264ca1af1d6
commit61ccf733ccf1f64760553f6915fc7264ca1af1d6
authorEmmanuele Bassi <ebassi@gmail.com>
Tue, 29 May 2018 07:43:56 +0000 (29 07:43 +0000)
committerEmmanuele Bassi <ebassi@gmail.com>
Tue, 29 May 2018 07:43:56 +0000 (29 07:43 +0000)
tree564b588fc1bd7f17e9e93f7eb71d397e99cf1d65
parentcd47f8d8de72f0fe40a50aa8a6cae210622a8ef9
parent25af5ad1dabeb27c2d9adf269190a131103e70bf
Merge branch 'wip/rishi/issue-1073' into 'master'

Revert "Return folder as icon for directories"

See merge request GNOME/glib!36