Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request hace 10 años
..
icon 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request hace 10 años
splash 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request hace 10 años