Alinson Xavier 436d19dfea Merge branch 'dev' into feature/stackview ... # Conflicts: # uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt		2018-06-16 18:06:23 -05:00
..
src	Merge branch 'dev' into feature/stackview	2018-06-16 18:06:23 -05:00
.gitignore	Create module uhabits-core	2017-05-25 08:16:55 -04:00
build.gradle	Add tests for equals, hashCode and toString	2017-07-24 11:41:12 -04:00