Commit Graph

3 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 eaaedb6fbf -> add a .h file to define the vector color
-> restore the done button on the roomSettingsViewController.
2015-11-26 18:04:03 +01:00
yannick 47e6040b02 Rename RoomExtraInfosView into RoomActivitiesView 2015-11-24 12:34:08 +00:00