2 Commits (2db4c06fe894c69b90ab182f7e979b043996a140)

Author	SHA1	Message	Date
Alinson S. Xavier	2db4c06fe8	Merge branch 'master' into dev ... # Conflicts: # app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java # app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java # app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java # app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java # app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java # app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java # app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java # uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java # uhabits-android/src/main/res/values-id/strings.xml # uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java	8 years ago
Alinson S. Xavier	c20ca3921f	Rename android module to uhabits-android	8 years ago