Files
bundesmessenger-ios/Vector.xcodeproj
yannick 74de3eeb0f Merge remote-tracking branch 'origin/develop' into display_room_avatars
Conflicts:
	Vector/ViewController/RoomViewController.m
2015-12-04 16:43:11 +01:00
..