Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
..
icon 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
splash 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren