Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 08:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
element-ios/Vector/Views
History
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
..
Authentication Authentication: prepare C-S auth API v2 support 2015-09-28 10:23:33 +02:00
RoomActivitiesView Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomBubbleList Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomInputToolbar Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomList Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomTitle Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
TableViewCell Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00