Files
bundesmessenger-ios/Vector/Base.lproj
manuroe 452152ca20 Merge remote-tracking branch 'origin/develop' into search_api_support
Conflicts:
	Vector/Base.lproj/Main.storyboard
	Vector/ViewController/RecentsViewController.m
2015-12-07 11:47:49 +01:00
..