Merge remote-tracking branch 'origin/develop' into reskin

This commit is contained in:
manuroe
2019-01-09 16:38:49 +01:00
32 changed files with 1106 additions and 198 deletions
@@ -3227,7 +3227,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
return canSetCanonicalAlias;
}
- (void)shouldRemoveCanonicalAlias:(void (^)())didRemoveCanonicalAlias
- (void)shouldRemoveCanonicalAlias:(void (^)(void))didRemoveCanonicalAlias
{
// Prompt the user before removing the current main address
[currentAlert dismissViewControllerAnimated:NO completion:nil];