Merge branch 'release/1.2.0' into dev

CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+
+### 1.2.0 (March 4, 2016)
+
+* Ability to export habit data as CSV
+* Widgets (checkmark, history, score and streaks)
+* More natural scrolling on data views (fling)
+* Minor UI improvements on pre-Lollipop devices
+* Fix crash on Samsung Galaxy TabS 8.4
+* Other minor bug fixes
+
+### 1.1.1 (February 24, 2016)
+
+* Show reminder only on chosen days of the week
+* Rearrange habits by long-pressing then dragging
+* Select and modify multiple habits simultaneously
+* 12/24 hour format according to phone preferences
+* Permanently delete habits
+* Usage hints during startup
+* Translation to Brazilian Portuguese and Chinese
+* Other minor fixes
+
+### 1.0.0 (February 19, 2016)
+
+* Initial release

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest
     package="org.isoron.uhabits"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="8"
+    android:versionCode="9"
-    android:versionName="1.1.1">
+    android:versionName="1.2.0">
 
     <uses-permission
         android:name="android.permission.VIBRATE"/>