David Baker f5ab271ec9 Merge branch 'develop' into apns ... Conflicts: samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj		2015-01-26 17:35:42 +00:00
..
API	Merge branch 'develop' into apns	2015-01-26 17:35:42 +00:00
Assets	More messages for invites & things	2015-01-26 17:29:45 +00:00
Base.lproj	Console: Prepare email linkage.	2015-01-23 18:45:13 +01:00
External	Do not embed external codes in the project. CocoaPods is our friend for that.	2015-01-14 11:52:51 +01:00
Images.xcassets	Rename directories of sample sources (matrixConsole)	2014-11-24 10:38:23 +01:00
Model	Rename MatrixHandler to MatrixSDKHandler	2015-01-23 15:36:05 +01:00
View	Console: Prepare email linkage.	2015-01-23 18:45:13 +01:00
ViewController	Console: Refactor saving process in Settings	2015-01-26 16:51:34 +01:00
AppDelegate.h	Renaming:	2015-01-23 13:46:27 +01:00
AppDelegate.m	Merge branch 'develop' into apns	2015-01-26 17:35:42 +00:00
AppSettings.h	Add the max cache size slider in the settings page.	2015-01-19 08:58:45 +01:00
AppSettings.m	Rename MatrixHandler to MatrixSDKHandler	2015-01-23 15:36:05 +01:00
Info.plist	Prepare 0.2.1 release	2015-01-14 13:26:49 +01:00
main.m	Rename directories of sample sources (matrixConsole)	2014-11-24 10:38:23 +01:00
matrixConsole-Defaults.plist	SIOS-20 : the left participants are not displayed by default (must be enabled in the device settings)	2014-12-17 14:40:39 +01:00