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

# Conflicts:
#	Riot/Constants/RiotDesignValues.m
#	Riot/Modules/Authentication/AuthenticationViewController.m
This commit is contained in:
manuroe
2019-01-10 11:50:57 +01:00
31 changed files with 240 additions and 206 deletions
@@ -893,7 +893,7 @@
NSArray<MXRoomTag*>* tags = room.accountData.tags.allValues;
if (tags.count)
{
currentTag = [tags objectAtIndex:0];
currentTag = tags[0];
}
}