 manuroe
|
e1f00a3879
|
Podfile Came back to local as MatrixKit develope does not get MatrixSDK develop
|
2015-04-03 18:19:06 +02:00 |
|
|
manuroe
|
910a2e7910
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
Console/Podfile
Console/Podfile.lock
Console/matrixConsole.xcodeproj/project.pbxproj
Console/matrixConsole/API/MatrixSDKHandler.m
Console/matrixConsole/AppDelegate.h
Console/matrixConsole/AppDelegate.m
Console/matrixConsole/Base.lproj/Main.storyboard
Console/matrixConsole/Model/MXCContactField.m
Console/matrixConsole/Model/MXCEmail.m
Console/matrixConsole/Model/RageShakableUIResponder.h
Console/matrixConsole/Model/RageShakableUIResponder.m
Console/matrixConsole/View/ContactTableCell.h
Console/matrixConsole/View/MXCGrowingTextView.m
Console/matrixConsole/View/RoomMemberTableCell.h
Console/matrixConsole/View/RoomMemberTableCell.m
Console/matrixConsole/ViewController/AuthenticationViewController.m
Console/matrixConsole/ViewController/ContactsViewController.m
Console/matrixConsole/ViewController/MasterTabBarController.m
Console/matrixConsole/ViewController/MemberViewController.m
Console/matrixConsole/ViewController/RecentsViewController.h
Console/matrixConsole/ViewController/RecentsViewController.m
Console/matrixConsole/ViewController/RoomViewController.h
Console/matrixConsole/ViewController/RoomViewController.m
Console/matrixConsole/ViewController/SettingsViewController.m
|
2015-04-03 18:01:43 +02:00 |
|
|
manuroe
|
377c945321
|
Moved matrixConsole to Console
|
2015-04-03 16:20:36 +02:00 |
|
|
manuroe
|
ce57aaa7fa
|
MatrixSDK repo splitting: Fake release called 0.3.2 to match the one from the original repo
|
2015-04-03 11:47:26 +02:00 |
|
|
manuroe
|
7971740529
|
Moved code under a subdirectory: Console
|
2015-04-03 09:04:46 +02:00 |
|
|
manuroe
|
2b0350d14f
|
Moved code under a subdirectory: Console
|
2015-04-03 09:04:22 +02:00 |
|