Files
bundesmessenger-ios/Riot/ViewController
manuroe a8302ce9df Merge remote-tracking branch 'origin/develop' into room_summary
# Conflicts:
#	Riot/Categories/MXRoom+Riot.m
#	Riot/Model/RoomList/RecentCellData.m
2017-03-15 17:24:54 +01:00
..