Files
bundesmessenger-ios/Vector.xcodeproj
manuroe 4ec9d21924 Merge remote-tracking branch 'origin/develop' into public_rooms_search
Conflicts:
	Vector/Utils/AvatarGenerator.m
	Vector/ViewController/HomeViewController.m
2015-12-23 11:05:46 +01:00
..