Merge branch 'develop' of https://github.com/Genti2024/Genti-Android …

…into production

.github/workflows/firebase_distribution_builder.yml

@@ -91,5 +91,5 @@ jobs:
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git fetch origin
           git checkout develop
-          git merge production --no-ff --no-edit
+          git merge production --no-ff --no-edit --allow-unrelated-histories
           git push origin develop