Merge branch 'develop' into aringenbach/3526_user_pills

This commit is contained in:
aringenbach
2022-04-28 11:56:09 +02:00
39 changed files with 1910 additions and 65 deletions
@@ -175,7 +175,7 @@ typedef BOOL (^MXKAccountOnCertificateChange)(MXKAccount *mxAccount, NSData *cer
@param credentials user's credentials
*/
- (instancetype)initWithCredentials:(MXCredentials*)credentials;
- (nonnull instancetype)initWithCredentials:(MXCredentials*)credentials;
/**
Create a matrix session based on the provided store.
@@ -135,7 +135,7 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
}
}
- (instancetype)initWithCredentials:(MXCredentials*)credentials
- (nonnull instancetype)initWithCredentials:(MXCredentials*)credentials
{
if (self = [super init])
{