Merge branch 'dev' into feature/stackview

# Conflicts:
#	uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt
This commit is contained in:
2018-06-16 18:06:23 -05:00
70 changed files with 1255 additions and 552 deletions

View File

@@ -19,7 +19,9 @@
-->
<manifest
package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="36"
android:versionName="1.7.9">
<uses-permission android:name="android.permission.VIBRATE"/>