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 382b52e5b2 Merge tag 'v1.7.4' into dev ... 1.7.4 # Conflicts: # app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java # app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java # uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java		8 years ago
..
src	Merge tag 'v1.7.4' into dev	8 years ago
build.gradle	Merge branch 'dev' of https://github.com/austil/uhabits into pull/austil	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