element-ios/matrixConsole/API
giomfo 5c3baf0180 Merge remote-tracking branch 'origin/develop' into with-contacts
Conflicts:
	samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-23 14:10:47 +01:00
..
ContactManager.h -> use the new MXRestClient::lookup3pids method 2015-01-22 12:01:12 +01:00
ContactManager.m -> use the new MXRestClient::lookup3pids method 2015-01-22 12:01:12 +01:00
MediaLoader.h 1 - the uploads are cancellable 2015-01-19 15:30:45 +01:00
MediaLoader.m Renaming: 2015-01-23 13:46:27 +01:00
MediaManager.h Should fix SYIOS-56 : add cache size handling in settings 2015-01-19 16:53:29 +01:00
MediaManager.m Renaming: 2015-01-23 13:46:27 +01:00
MXCTools.h Renaming: 2015-01-23 13:46:27 +01:00
MXCTools.m Renaming: 2015-01-23 13:46:27 +01:00