Daniel Gultsch a3f9f30a6c Merge pull request #885 from SamWhited/display-enter-key ... Add option to swap enter/emoticon key		2015-01-14 22:54:02 +01:00
..
java/eu/siacs/conversations	Merge pull request #885 from SamWhited/display-enter-key	2015-01-14 22:54:02 +01:00
res	Merge pull request #885 from SamWhited/display-enter-key	2015-01-14 22:54:02 +01:00
AndroidManifest.xml	migrated change password into separate activity	2015-01-03 00:11:02 +01:00