Federico Maccaroni
|
51ee6a84b5
|
Merged main into maui-migration
|
2024-02-08 12:17:34 -03:00 |
|
Federico Maccaroni
|
ec1ade7761
|
Merge branch 'main' into feature/maui-migration
# Conflicts:
# src/App/Platforms/Android/AndroidManifest.xml
|
2024-01-29 13:58:30 -03:00 |
|
Federico Maccaroni
|
cd107b6161
|
Merge branch 'main' into feature/maui-migration
# Conflicts:
# src/App/Platforms/Android/AndroidManifest.xml
# src/iOS.Core/Renderers/CollectionView/ExtendedGroupableItemsViewController.cs
|
2024-01-11 14:17:34 -03:00 |
|
Federico Maccaroni
|
adaef0d15b
|
Merge branch 'main' into feature/maui-migration
# Conflicts:
# src/App/Platforms/Android/AndroidManifest.xml
|
2024-01-02 13:20:15 -03:00 |
|
Federico Maccaroni
|
3a40a4cda8
|
PM-3349 Upgraded Android targetSdkVersion to 34
|
2023-12-14 17:52:11 -03:00 |
|
Federico Maccaroni
|
7a5f7c0274
|
Merge branch 'master' into feature/maui-migration
|
2023-12-11 11:42:46 -03:00 |
|
Dinis Vieira
|
e840dc2e30
|
Merge branch 'master' into feature/maui-migration
Fixed conflicts and added null check on ForwardEmailDomainName
# Conflicts:
# src/Core/Pages/Vault/CipherAddEditPage.xaml
# src/Core/Pages/Vault/CipherDetailsPage.xaml
# src/iOS.Core/Renderers/CollectionView/ExtendedGroupableItemsViewController.cs
|
2023-11-05 23:59:30 +00:00 |
|
Federico Maccaroni
|
8ef9443b1e
|
PM-3349 PM-3350 MAUI Migration Initial
|
2023-09-29 11:02:19 -03:00 |
|