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
build.gradle	Code review changes; Made 'stack view' design available for all widgets	2017-11-08 21:03:06 -05:00
lint.xml	Rename android module to uhabits-android	2017-05-25 08:00:00 -04:00
proguard-rules.txt	Reactivate proguard	2017-07-25 18:09:48 -04:00