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 8a29fbf07d Merge branch 'hotfix/1.7.3' into modules ... # Conflicts: # uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java # uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java # uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java		8 years ago
..
src	Merge branch 'hotfix/1.7.3' into modules	8 years ago
build.gradle	Add test for BundleSavedState	8 years ago
lint.xml	Rename android module to uhabits-android	8 years ago
proguard-rules.txt	Rename android module to uhabits-android	8 years ago