Daniel Gultsch 9edcca1045 Merge branch 'master' into development		2015-08-16 15:01:06 +02:00
..
crypto	catch null pointer in ScramSHA1 sasl	2015-08-16 11:50:33 +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	catch broken base64 in avatars	2015-08-16 14:55:24 +02:00
services	fully depend on sm	2015-08-15 16:57:07 +02:00
ui	Display error message if all contact keys purged	2015-08-15 18:52:47 +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	Merge branch 'master' into development	2015-08-16 15:01:06 +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