diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2020-07-23 23:05:18 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2020-07-23 23:05:18 +0530 |
| commit | f256d5f2447a62af0e881eed56749cd0db610c8c (patch) | |
| tree | dc3975d56c93584a17272d3f93c9ddd72cbf76a7 | |
| parent | a9897af0309332df9bbfafee7b1c782d5d73e13d (diff) | |
| parent | 5c28fe9817446008c7d343fa3e020114b132ab15 (diff) | |
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>
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | app/build.gradle.kts | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2df62f16..b186d093 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [1.10.1] - 2020-07-23 + ### Fixed - 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. -[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 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a63151c0..9b67f099 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,7 +28,7 @@ android { defaultConfig { applicationId = "dev.msfjarvis.aps" - versionCode = 11001 + versionCode = 11011 versionName = "1.11.0-SNAPSHOT" } |