Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 anni fa
..
android 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 anni fa
ios 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 anni fa
icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 anni fa
splash.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 anni fa