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
build.gradle	Merge branch 'dev' of https://github.com/austil/uhabits into pull/austil	2017-06-04 11:30:10 -04:00
lint.xml	Rename android module to uhabits-android	2017-05-25 08:00:00 -04:00
proguard-rules.txt	Rename android module to uhabits-android	2017-05-25 08:00:00 -04:00