habitica-android/gradle
Negue 8b1865166c Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into apply_tranformations
Conflicts:
	Habitica/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties
2016-10-12 21:15:05 +02:00
..
wrapper Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into apply_tranformations 2016-10-12 21:15:05 +02:00