Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
element-ios/Vector
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
..
API Update version of the pod dependencies 2015-09-24 11:53:56 +02:00
Assets Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
Base.lproj Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
Categories Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
Images.xcassets/AppIcon.appiconset replace matrixConsole project with Vector Xcode project. 2015-08-10 16:58:31 +02:00
Model Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
Resources replace matrixConsole project with Vector Xcode project. 2015-08-10 16:58:31 +02:00
Utils Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
ViewController Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
Views Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
AppDelegate.h HomeVC: Use it from the AppDelegate 2015-12-09 18:12:42 +01:00
AppDelegate.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
empty.mm replace matrixConsole project with Vector Xcode project. 2015-08-10 16:58:31 +02:00
Info.plist Info.plist: define the vector app bundle id 2015-11-26 14:27:28 +01:00
main.m replace matrixConsole project with Vector Xcode project. 2015-08-10 16:58:31 +02:00
Vector-Defaults.plist Defaults.plist: define pusher app ids for Vector 2015-11-26 14:27:59 +01:00