Daniel Gultsch 43dd681239 timeout service discovery after 20s		2015-12-15 19:24:05 +01:00
..
java/eu/siacs/conversations	timeout service discovery after 20s	2015-12-15 19:24:05 +01:00
res	pulled translations from transifex	2015-12-13 11:09:42 +01:00
AndroidManifest.xml	implement direct sharing in android 6.0. fixes #1321	2015-12-07 13:24:41 +01:00