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