Merge branch 'master' into gilbert
[philo.git] / contrib / gilbert / media / gilbert / murano / images / icons / cross.png
contrib/gilbert/media/gilbert/murano/images/icons/cross.png