mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-04-14 11:46:32 +00:00
c5473c58bc
# Conflicts: # Habitica/res/layout/dialog_pet_suggest_hatch.xml # Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt # Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBackgroundContent.kt # common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
1 line
No EOL
6 B
Text
1 line
No EOL
6 B
Text
/build |