Alinson 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

2017-05-29 22:55:08 -04:00

..

src

Merge branch 'hotfix/1.7.3' into modules

2017-05-29 22:55:08 -04:00

.gitignore

Create module uhabits-core

2017-05-25 08:16:55 -04:00

build.gradle

Make generated classes work on Android Studio

2017-05-28 11:39:07 -04:00