Negue b75949d7a1 Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into task-repository ... Conflicts: Habitica/src/main/java/com/habitrpg/android/habitica/ApiClient.java Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.java Habitica/src/test/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManagerTest.java		2017-02-07 23:53:54 +01:00
..
_cleanup.gss	Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into task-repository	2017-02-07 23:53:54 +01:00
_file_state_v4._gs	Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into task-repository	2017-02-07 23:53:54 +01:00
_insync_v4.gsl	Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into task-repository	2017-02-07 23:53:54 +01:00