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

* origin/release:
  build: prepare next development version
  build: bump version
  Prepare release 1.10.1
  Add CHANGELOG entries for 1.10.1 (#961)
  Wire in fallback key selection flow (#958)
  Fix OpenPgpApi extra type confusion (#960)
  Fix a crash when parsing long key IDs (#959)

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya
2020-07-23 23:05:18 +05:30
2 changed files with 6 additions and 2 deletions

View File

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
## [Unreleased] ## [Unreleased]
## [1.10.1] - 2020-07-23
### Fixed ### Fixed
- Using long key IDs in .gpg-id no longer leads to a crash - Using long key IDs in .gpg-id no longer leads to a crash
@@ -257,7 +259,9 @@ All notable changes to this project will be documented in this file.
- Fix elements overlapping. - Fix elements overlapping.
[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/1.10.0...HEAD [Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/1.10.1...HEAD
[1.10.1]: https://github.com/android-password-store/Android-Password-Store/compare/1.10.0...1.10.1
[1.10.0]: https://github.com/android-password-store/Android-Password-Store/compare/1.9.2...1.10.0 [1.10.0]: https://github.com/android-password-store/Android-Password-Store/compare/1.9.2...1.10.0

View File

@@ -28,7 +28,7 @@ android {
defaultConfig { defaultConfig {
applicationId = "dev.msfjarvis.aps" applicationId = "dev.msfjarvis.aps"
versionCode = 11001 versionCode = 11011
versionName = "1.11.0-SNAPSHOT" versionName = "1.11.0-SNAPSHOT"
} }