Merge remote-tracking branch 'origin/more_pages' into more_pages · Modarb-Ai-Trainer/modarb-android@b361504 · GitHub

Commit

Merge remote-tracking branch 'origin/more_pages' into more_pages

Browse files

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/modarb/android/ui/home/ui/more/activities/ChallengeActivity.kt
#	app/src/main/java/com/modarb/android/ui/menu/activities/MenuActivity.kt
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/strings.xml

Loading branch information

amrhossamdev committed Apr 30, 2024

2 parents 5f00c2e + 77e5c9e commit b361504