Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request il y a 10 ans
..
android 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request il y a 10 ans
ios 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request il y a 10 ans
icon.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request il y a 10 ans
splash.png 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request il y a 10 ans