Daniel Gultsch f2696b66ba Merge branch 'feature-remove-merge-separator' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-merge-separator		2016-10-20 18:18:25 +02:00
..
free/java/eu/siacs/conversations/services	fixed server info push not showing up when unavailable	2016-02-14 18:19:11 +01:00
main	Merge branch 'feature-remove-merge-separator' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-merge-separator	2016-10-20 18:18:25 +02:00
playstore	broader exception catchers	2016-08-30 13:15:00 +02:00