Merge remote-tracking branch 'origin/release' into develop

* origin/release:
  build: bump version
  build: drop -free suffix
  Remember HTTPS password throughout a sync operation (#1062)

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

2 files changed, 9 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ecb1ad7..a0067ecb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,11 @@ All notable changes to this project will be documented in this file.
 -   Password creation UI will scroll if it does not fit on the screen
 -   Git server protocol and authentication mode are only updated when explicitly saved
 -   Remember HTTPS password during a sync operation
+
+## [1.11.3] - 2020-08-27
+
+### Fixed
+
 -   Delete stored HTTPS password on connection errors (such as failed authentication)
 
 ## [1.11.2] - 2020-08-24
@@ -329,7 +334,9 @@ All notable changes to this project will be documented in this file.
 
 -   Fix elements overlapping.
 
-[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.2...HEAD
+[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.3...HEAD
+
+[1.11.3]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.2...1.11.3
 
 [1.11.2]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.1...1.11.2
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5cb9e9f5..c4a17e43 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -30,7 +30,7 @@ android {
 
     defaultConfig {
         applicationId = "dev.msfjarvis.aps"
-        versionCode = 11121
+        versionCode = 11131
         versionName = "1.12.0-SNAPSHOT"
     }
 
@@ -80,7 +80,6 @@ android {
     flavorDimensions("free")
     productFlavors {
         create("free") {
-            versionNameSuffix = "-free"
         }
         create("nonFree") {
         }