element-ios/Vector/Assets/en.lproj
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
..
Localizable.strings replace matrixConsole project with Vector Xcode project. 2015-08-10 16:58:31 +02:00
Vector.strings Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-23 11:05:46 +01:00