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