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
This commit is contained in:
2017-06-05 09:20:47 -04:00
3 changed files with 4 additions and 6 deletions

View File

@@ -20,8 +20,8 @@
<manifest
package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="30"
android:versionName="1.7.3">
android:versionCode="31"
android:versionName="1.7.4">
<uses-permission android:name="android.permission.VIBRATE"/>