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
..
java/org/isoron/uhabits/core	Merge branch 'dev' into feature/stackview	2018-06-16 18:06:23 -05:00
resources/migrations