Merge pull request #164 from nextcloud/release120

Release 1.2.0
nextcloud · Jul 28, 2016 · c827ea5 · c827ea5
2 parents 0626040 + fde5660
commit c827ea5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10020002"
-    android:versionName="1.2.0 RC2">
+    android:versionCode="10020099"
+    android:versionName="1.2.0">
 
     <uses-sdk
         android:minSdkVersion="14"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.2.0 (2016)
+## 1.2.0 (July 29, 2016)
 
 - Multi select capabilities
 - confirmation dialog on account removal