Commit graph

2 commits

Author SHA1 Message Date
giomfo
4051cf4fdb Merge remote-tracking branch 'origin/develop' into with-contacts
Conflicts:
	samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
	samples/matrixConsole/matrixConsole/AppDelegate.m
2015-01-23 15:53:39 +01:00
giomfo
4ce33b1500 Replace Console prefix with MXC 2015-01-23 14:22:02 +01:00
Renamed from matrixConsole/Model/ConsoleContactField.m (Browse further)