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
..
crypto	write prepped string to db. use display version everywhere else	2016-10-20 17:31:46 +02:00
entities	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
generator	include pgp signature only in non anonymous mucs	2016-10-19 12:31:11 +02:00
http	add timeouts to HTTPUrlConnections and allow cancelation of all sending files	2016-09-20 20:02:25 +02:00
parser	fetch new conference configuration on every conf update	2016-10-08 12:10:53 +02:00
persistance	write prepped string to db. use display version everywhere else	2016-10-20 17:31:46 +02:00
services	introduced low ping timeout mode after gcm push	2016-10-20 18:02:11 +02:00
ui	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
utils	fixed account hash calculation	2016-10-07 14:54:06 +02:00
xml	catch all throwables when parsing xml	2016-08-02 10:58:54 +02:00
xmpp	write prepped string to db. use display version everywhere else	2016-10-20 17:31:46 +02:00
Config.java	introduced low ping timeout mode after gcm push	2016-10-20 18:02:11 +02:00