Commit Graph

2 Commits

Author SHA1 Message Date
manuroe 68fd187509 Merge remote-tracking branch 'origin/develop' into public_rooms_search
Conflicts:
	Vector/Base.lproj/Main.storyboard
	Vector/Model/RoomList/RecentsDataSource.m
2015-12-21 10:35:48 +01:00
yannick e715344144 -> MXKRoomDetailsViewController becomes MXKSettingsDetailsViewController
-> The room details is now properly launched.
2015-11-26 16:47:24 +01:00