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 03ac45c673 Plug the RoomDetailsViewController
But
-> the update is not yet done
-> the ui must be updated.
2015-11-20 14:12:37 +01:00