Conversation
djsmith85
approved these changes
Nov 19, 2021
fedemkr
added a commit
that referenced
this pull request
Nov 24, 2021
* master: (26 commits) Add support for Pluma Browser for Android (#1639) Update Focus/Klar accessibility and autofill IDs (#1535) Add workaround to Android entry renderer (#1658) [Key Connector] Hide MP input in iOS extensions (#1656) ui changes for lock screen if using key connector with biometrics (#1654) Revert "Add Share app Extension on iOS for Send (#1647)" (#1655) Add Share app Extension on iOS for Send (#1647) Bug/cme autofill unlock (#1653) ui changes export vault screen for key connector (#1651) Autosync the updated translations (#1652) Fixed missing FavIcons on Android #1640 (#1649) Hide Master Pass On Restart for Key Connector (#1650) Show SSO login if using key-connector without bio or pin (#1648) Autosync the updated translations (#1642) pass OrgId to SSO login while using CME (#1646) [KeyConnector] Add support for key connector OTP (#1633) [Linked fields] Add Linked Field as a custom field type (#1563) Change Release workflow to allow releases from 'rc' and 'hotfix' branches (#1632) fixing a typo (#1634) Updating the crowdin sync process (#1630) ... # Conflicts: # src/App/Abstractions/IPasswordRepromptService.cs # src/App/Resources/AppResources.Designer.cs # src/App/Resources/AppResources.resx # src/App/Services/MobilePasswordRepromptService.cs # src/Core/Services/ApiService.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Autosync the updated translations