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