diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2021-01-12 21:42:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 21:42:53 +0530 |
| commit | 1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4 (patch) | |
| tree | 3cce3972dd01f6c5cc4884e5c7b99c5e2db7eae5 /CHANGELOG.md | |
| parent | 8bd156dea6e87eb667f76f4738fde992323ce0cf (diff) | |
| download | HardenedPass-1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4.tar.gz HardenedPass-1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4.zip | |
Allow configuring pull behaviour (#1276)
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 58e172d3..2f0d1ca1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. - On Android 11, Autofill will use the new [inline autofill](https://developer.android.com/guide/topics/text/ime-autofill#configure-provider) UI that integrates Autofill results into your keyboard app. - Invalid `.gpg-id` files can now be fixed automatically by deleting them and then trying to create a new password. - Suggest users to re-clone repository when it is deemed to be broken +- Allow doing a merge instead of a rebase when pulling or syncing ### Fixed |