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 /app/src/nonFree/java | |
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>
Diffstat (limited to 'app/src/nonFree/java')
0 files changed, 0 insertions, 0 deletions