A glossy Matrix collaboration client for iOS
Find a file
giomfo 3b6b4e633b Merge remote-tracking branch 'origin/develop' into with-contacts
Conflicts:
	samples/matrixConsole/matrixConsole/ViewController/SettingsViewController.m
2015-01-27 10:29:34 +01:00
matrixConsole Merge remote-tracking branch 'origin/develop' into with-contacts 2015-01-27 10:29:34 +01:00