Daniel Gultsch 42c807ead8 Merge branch 'soft-keyboard-bug' of https://github.com/harshitbansal05/Conversations into harshitbansal05-soft-keyboard-bug		2018-01-21 12:26:57 +01:00
..
free/java/eu/siacs/conversations	use emoji compat	2017-09-29 19:44:30 +02:00
main	Merge branch 'soft-keyboard-bug' of https://github.com/harshitbansal05/Conversations into harshitbansal05-soft-keyboard-bug	2018-01-21 12:26:57 +01:00
playstore	remove prosody push from blacklist	2017-11-12 19:22:39 +01:00