Benjamin Reis 36084211dd Merge branch 'master' into dev_group_chat		2018-01-09 11:14:56 +01:00
..
xcshareddata/xcschemes	remove warnings and deprecated calls	2017-09-28 15:39:26 +02:00
.gitignore	Add files to .gitignore	2012-09-11 17:58:57 +02:00
project.pbxproj	Merge branch 'master' into dev_group_chat	2018-01-09 11:14:56 +01:00