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
..
file_paths.xml	Rename android module to uhabits-android	2017-05-25 08:00:00 -04:00
preferences.xml	Merge branch 'master' into dev	2018-06-04 19:57:02 -05:00
widget_checkmark_info.xml	Code review changes; Made 'stack view' design available for all widgets	2017-11-08 21:03:06 -05:00
widget_frequency_info.xml	Rename android module to uhabits-android	2017-05-25 08:00:00 -04:00
widget_history_info.xml	Rename android module to uhabits-android	2017-05-25 08:00:00 -04:00
widget_score_info.xml	Rename android module to uhabits-android	2017-05-25 08:00:00 -04:00
widget_streak_info.xml	Rename android module to uhabits-android	2017-05-25 08:00:00 -04:00