felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-02 14:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	Vector/Base.lproj/Main.storyboard
	Vector/Model/RoomList/RecentsDataSource.m
This commit is contained in:
manuroe
2015-12-21 10:35:48 +01:00
parent 92e0fdbe92
commit 68fd187509
64 changed files with 2452 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Utils/EventFormatter.m
+1 -1
View File
@@ -124,7 +124,7 @@
if (time)
{
[dateFormatter setDateFormat:nil];
return [NSString stringWithFormat:@"today %@", [super dateStringFromDate:date withTime:YES]];
return [NSString stringWithFormat:@"%@", [super dateStringFromDate:date withTime:YES]];
}
return @"today";
}