habitica-android/Habitica/assets/migrations/Habitica/2.sql
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

0 lines
MySQL