Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 10 години
..
icon 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 10 години
splash 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 10 години