You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Alinson S. Xavier 436d19dfea Merge branch 'dev' into feature/stackview ... # Conflicts: # uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt		7 years ago
..
java/org/isoron/uhabits/core	Merge branch 'dev' into feature/stackview	7 years ago
resources/migrations	avoid sql error when updating sql database	8 years ago