sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-22 05:45:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
habitica-android/Habitica/assets
History
Phillip Thelen d56237e726 Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into sidebar 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/AvatarActivityBase.java
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
	Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java
2015-11-18 16:08:49 +01:00
..
migrations/Habitica Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into sidebar 2015-11-18 16:08:49 +01:00
paperboy update changelog 2015-11-15 20:32:41 +01:00