Daniel Gultsch 777dd4b51e Merge branch 'master' into development		2015-08-23 17:29:46 +02:00
..
crypto	Add error handling to OMEMO PEP code	2015-08-23 13:23:51 +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	modified clearIqCallbacks into 2-step process	2015-08-23 08:01:47 +02:00
persistance	check if inputstream is null before cropping avatar images	2015-08-19 12:25:17 +02:00
services	Merge branch 'master' into development	2015-08-23 13:57:14 +02:00
ui	Display error message if all contact keys purged	2015-08-15 18:52:47 +02:00
utils	catch package manager has died exception	2015-08-19 12:24:42 +02:00
xml	modified clearIqCallbacks into 2-step process	2015-08-23 08:01:47 +02:00
xmpp	Merge branch 'master' into development	2015-08-23 17:29:46 +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