Merge branch 'dev' into feature/refactoring-mvc

This commit is contained in:
2016-06-19 16:13:43 -04:00
7 changed files with 416 additions and 46 deletions

View File

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