Stephen Paul Weber 426a4770f3 Merge branch 'image-attachments' ... * image-attachments: Downloadable gets priority over emojis only Display both message body and media, where relevant Store oobUri and preserve message body		2022-03-08 16:19:55 -05:00
..
java/eu/siacs/conversations	Merge branch 'image-attachments'	2022-03-08 16:19:55 -05:00
res	Merge remote-tracking branch 'upstream/master'	2022-03-08 15:38:48 -05:00
AndroidManifest.xml	add openkeychain to queries	2022-02-22 17:24:03 +01:00