habitica-android/Habitica
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
..
assets Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into sidebar 2015-11-18 16:08:49 +01:00
gradle/wrapper Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00
res Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into sidebar 2015-11-18 16:08:49 +01:00
src/com Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into sidebar 2015-11-18 16:08:49 +01:00
AndroidManifest.xml Version 0.0.9 2015-11-16 22:51:30 +01:00
build.gradle Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into sidebar 2015-11-18 16:08:49 +01:00
ic_launcher-web.png Update App Icon 2015-06-20 20:03:26 +02:00
lint.xml Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00
proguard-project.txt Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00
project.properties Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00