Merge pull request #2064 from owncloud/2.5.1_beta_v1

Including new versions and changelog for 2.5.1 beta v1 version
owncloud · Nov 14, 2017 · af44c2a · af44c2a
2 parents d84b53a + 4b953dd
commit af44c2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.5.1 beta v1 (November 2017)
+- Camera uploads (replacing instant uploads)
+- Android O support
+- Notification channels (Android O required)
+- Private link (OC X required)
+- Fixed typos in some translations
+
 ## 2.5.0 (October 2017)
 - OAuth2 support
 - Show file listing option (anonymous upload) when sharing a folder (OC X required)

diff --git a/build.gradle b/build.gradle
@@ -188,8 +188,8 @@ android {
 
         beta {
 
-            manifestPlaceholders.versionCode = "20400001"
-            manifestPlaceholders.versionName = "2.5.0-beta.2"
+            manifestPlaceholders.versionCode = "20500001"
+            manifestPlaceholders.versionName = "2.5.1-beta.1"
 
             applicationIdSuffix ".beta"
         }