Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
..
android 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
ios 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
splash.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos