Daniel Gultsch d70b5f93f3 Merge branch 'development' of https://github.com/siacs/Conversations into development		2015-01-07 18:32:51 +01:00
..
java/eu/siacs/conversations	fixed invites	2015-01-07 16:45:44 +01:00
res	Merge pull request #847 from kriztan/patch-1	2015-01-07 18:30:16 +01:00
AndroidManifest.xml	migrated change password into separate activity	2015-01-03 00:11:02 +01:00