-
Côme Bernigaud authored
Conflicts: html/images/welcome.png html/themes/default/icons/48/apps/config-welcome.png html/themes/default/icons/48/status/welcome.png plugins/generic/welcome/main.inc
41af06f1
Conflicts: html/images/welcome.png html/themes/default/icons/48/apps/config-welcome.png html/themes/default/icons/48/status/welcome.png plugins/generic/welcome/main.inc