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
This commit is contained in:
2017-05-29 22:55:08 -04:00
8 changed files with 162 additions and 49 deletions

1
.gitignore vendored
View File

@@ -22,3 +22,4 @@ docs/
gen/
local.properties
crowdin.yaml
local