Files
bundesmessenger-ios/matrixConsole/matrixConsole.xcodeproj
giomfo d05faa25a0 Merge remote-tracking branch 'origin/develop' into with-contacts
Conflicts:
	samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-23 14:57:50 +01:00
..
2014-12-09 13:17:17 +00:00