Daniel Gultsch 1f34fb742c Merge branch 'development'		2015-08-15 14:26:37 +02:00
..
crypto	Increase number of published prekeys for release	2015-08-07 12:30:39 +02:00
entities	Let UNTRUSTED/UNDECIDED keys become INACTIVE	2015-08-01 18:30:11 +02:00
generator	use content-type in http slot request and stick with during upload	2015-08-01 22:37:17 +02:00
http	do not touch pictures that are already in the right format	2015-08-11 16:50:00 +02:00
parser	Merge branch 'development'	2015-08-15 14:26:37 +02:00
persistance	provide extra interface to close sockets. fixes #1330	2015-08-15 14:14:33 +02:00
services	provide extra interface to close sockets. fixes #1330	2015-08-15 14:14:33 +02:00
ui	show HTTP upload availability on Edit account screen	2015-08-14 22:24:05 +02:00
utils	do not touch pictures that are already in the right format	2015-08-11 16:50:00 +02:00
xml	Optimize imports	2015-07-20 14:26:29 +02:00
xmpp	do not touch pictures that are already in the right format	2015-08-11 16:50:00 +02:00
Config.java	report wrong file size in otr encrypted jingle file transfers to be compatible with conversations > 1.6	2015-08-10 12:55:37 +02:00