Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 11 anos atrás
..
android 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 11 anos atrás
ios 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 11 anos atrás
icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 11 anos atrás
splash.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 11 anos atrás