André Bispo 635b6bc184 Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options ...

# Conflicts:
#	src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
#	src/App/Resources/AppResources.resx
#	src/Core/Abstractions/IStateService.cs

2023-07-20 14:56:40 +01:00

..

Abstractions

Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options

2023-07-20 14:56:40 +01:00

Attributes

EC-487 Added helper to localize enum values and also a converter to use in xaml (#2048)

2022-08-23 12:34:29 -03:00

Enums

[PM-2287][PM-2289][PM-2293] Approval Options (#2608)

2023-07-12 19:12:57 +01:00

Exceptions

[PM-192] Refactor forwarded email providers (#2579)

2023-06-27 18:49:38 -03:00

Models

Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options

2023-07-20 14:56:40 +01:00

Resources

load EEFLongWordList from file

2019-05-28 17:06:57 -04:00

Services

Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options

2023-07-20 14:56:40 +01:00

Utilities

[PM-2287][PM-2289][PM-2293] Approval Options (#2608)

2023-07-12 19:12:57 +01:00

BitwardenIcons.cs

[SG-166] Two Step Login - Feature Branch (#2157)

2022-10-28 23:10:41 +01:00

Constants.cs

Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options

2023-07-20 14:56:40 +01:00

Core.csproj

[PM-192] Refactor forwarded email providers (#2579)

2023-06-27 18:49:38 -03:00