Alinson 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		2017-06-05 09:20:47 -04:00
..
src	Merge tag 'v1.7.4' into dev	2017-06-05 09:20:47 -04:00
.gitignore	Create module uhabits-core	2017-05-25 08:16:55 -04:00
build.gradle	Implement alternative checkmark algorithm	2017-06-04 10:58:00 -04:00