iNPUTmice 206fd3fc4b Merge branch 'development' of https://github.com/siacs/Conversations into development		2015-02-02 13:56:32 +01:00
..
java/eu/siacs/conversations	added more ciphers for old openssl versions	2015-02-02 13:55:56 +01:00
res	Remove another unused resource	2015-02-01 16:02:59 -05:00
AndroidManifest.xml	Remove title_activity_conversations and use app_name instead	2015-01-30 17:02:53 +01:00