Federico Maccaroni 76e0f7e1a4 Merge branch 'main' into feature/maui-migration-passkeys ... # Conflicts: # src/Core/Abstractions/ICipherService.cs # src/Core/Abstractions/IStateService.cs # src/Core/Models/AppOptions.cs # src/Core/Resources/Localization/AppResources.resx # src/Core/Utilities/ServiceContainer.cs # src/iOS.Autofill/iOS.Autofill.csproj		2024-04-18 13:28:22 -03:00
..
Accounts	Merge branch 'main' into feature/maui-migration-passkeys	2024-04-18 13:28:22 -03:00
Generator	[PM-3349] [PM-3350] MAUI Migration Initial (#2806)	2024-02-08 16:05:26 -03:00
Send	[PM-5917] Fix for send arrow now being touch sensitive to expand collapse (#3036)	2024-02-26 23:45:59 +00:00
Settings	[PM-5153] Android Passkey Implementation (#3020)	2024-04-09 21:57:31 +01:00
Vault	Merge branch 'main' into feature/maui-migration-passkeys	2024-04-18 13:28:22 -03:00
AndroidNavigationRedirectPage.xaml	[PM-3349] [PM-3350] MAUI Migration Initial (#2806)	2024-02-08 16:05:26 -03:00
AndroidNavigationRedirectPage.xaml.cs	PM-6552 Added missing using (#3052)	2024-03-04 13:29:22 +00:00
BaseContentPage.cs	[PM-3349] [PM-3350] MAUI Migration Initial (#2806)	2024-02-08 16:05:26 -03:00
BaseModalContentPage.cs	[PM-3349] [PM-3350] MAUI Migration Initial (#2806)	2024-02-08 16:05:26 -03:00
BaseViewModel.cs	[PM-3349] [PM-3350] MAUI Migration Initial (#2806)	2024-02-08 16:05:26 -03:00
CaptchaProtectedViewModel.cs	[PM-3349] [PM-3350] MAUI Migration Initial (#2806)	2024-02-08 16:05:26 -03:00
CollectionViewModel.cs	[PM-3349] [PM-3350] MAUI Migration Initial (#2806)	2024-02-08 16:05:26 -03:00
PickerViewModel.cs	[PM-3349] [PM-3350] MAUI Migration Initial (#2806)	2024-02-08 16:05:26 -03:00
TabsPage.cs	[PM-7407] Implemented check for organizations with unassigned items (#3150)	2024-04-12 15:52:39 -03:00
VaultFilterViewModel.cs	[PM-3349] [PM-3350] MAUI Migration Initial (#2806)	2024-02-08 16:05:26 -03:00