Merge pull request #94 from nextcloud/release110

Release 1.1.0 stable
nextcloud · Jul 6, 2016 · ddeed6f · ddeed6f
2 parents a4dabfb + 198b1ce
commit ddeed6f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 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="10010002"
-    android:versionName="1.1.0 RC2" >
+    android:versionCode="10010099"
+    android:versionName="1.1.0">
 
     <uses-sdk
         android:minSdkVersion="14"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
-## 1.1.0 RC1 (June 27, 2016)
+## 1.1.0 (July 6, 2016)
 
 - New main menu to switch accounts easily
 - Ability to open Nextcloud hosted files (read-only) from other apps that support the standard file chooser (requires Android 4.4 / KitKat or higher)
 - "Select all files" for upload within a folder
-- optional feature to auto-create monthly folders for your instant uploads
-- revamped login screen
+- Optional feature to auto-create monthly folders for your instant uploads
+- Revamped login screen
+- Minor bugfixes
 
 ## 1.0.1 (June 20, 2016)