element-ios/Vector/Base.lproj
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
..
LaunchScreen.xib Remove some matrix.org occurrences. 2015-08-25 18:50:30 +02:00
Main.storyboard Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00