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