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
@@ -20,6 +20,6 @@
@interface RoomsListViewController : MXKRecentListViewController
@property (copy) void (^failureBlock)();
@property (copy) void (^failureBlock)(void);
@end
@@ -114,7 +114,7 @@
NSArray *titles = @[NSLocalizedStringFromTable(@"title_rooms", @"Vector", nil) , NSLocalizedStringFromTable(@"title_people", @"Vector", nil)];
void (^failureBlock)() = ^void() {
void (^failureBlock)(void) = ^void() {
[self dismissViewControllerAnimated:YES completion:^{
[[ShareExtensionManager sharedManager] terminateExtensionCanceled:NO];
}];