Daniel Gultsch 17db77ed5d Merge branch 'trailing_url_slash' of https://github.com/klonfish/Conversations into klonfish-trailing_url_slash		2018-06-11 16:19:51 +02:00
..
java/eu/siacs/conversations	Merge branch 'trailing_url_slash' of https://github.com/klonfish/Conversations into klonfish-trailing_url_slash	2018-06-11 16:19:51 +02:00
res
AndroidManifest.xml