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
@@ -102,7 +102,7 @@
else
{
NSDictionary *infoDictionary = [NSBundle mainBundle].infoDictionary;
NSString *bundleDisplayName = [infoDictionary objectForKey:@"CFBundleDisplayName"];
NSString *bundleDisplayName = infoDictionary[@"CFBundleDisplayName"];
self.tittleLabel.text = bundleDisplayName;
[self configureFallbackViewController];
}