element-ios/Vector/Views/RoomInputToolbar
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
..
RoomInputToolbarView.h Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomInputToolbarView.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomInputToolbarView.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00