Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 лет назад
..
android 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 лет назад
ios 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 лет назад
icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 лет назад
splash.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 лет назад