Daniel Gultsch 9f3543a650 Merge branch 'message-marker' of https://github.com/hareshkh/Conversations into hareshkh-message-marker		2017-03-06 19:07:27 +01:00
..
free/java/eu/siacs/conversations/services	show doze warning when push is running on prosody	2017-01-12 23:22:02 +01:00
main	Merge branch 'message-marker' of https://github.com/hareshkh/Conversations into hareshkh-message-marker	2017-03-06 19:07:27 +01:00
playstore	migrate domain and host exemption into seperate class	2017-02-19 13:05:40 +01:00