cheogram/src/main/java/eu/siacs/conversations
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
..
android make custom 'xmpp' protocol in address book case insensitve 2021-10-31 08:35:44 +01:00
crypto bump agp 2022-02-24 12:41:32 +01:00
entities Merge branch 'image-attachments' 2022-03-08 16:19:55 -05:00
generator trigger registration dialog on roster;ibr=y only if no accounts are configured 2021-04-30 11:32:42 +02:00
http Merge branch 'image-attachments' 2022-03-08 16:19:55 -05:00
parser Store oobUri and preserve message body 2022-03-08 10:54:15 -05:00
persistance Merge branch 'image-attachments' 2022-03-08 16:19:55 -05:00
services Merge remote-tracking branch 'upstream/master' 2022-03-08 15:38:48 -05:00
ui Merge branch 'image-attachments' 2022-03-08 16:19:55 -05:00
utils Merge branch 'image-attachments' 2022-03-08 16:19:55 -05:00
xml flush stanzas in batches 2022-02-14 11:46:57 +01:00
xmpp Merge remote-tracking branch 'upstream/master' 2022-03-08 15:38:48 -05:00
Config.java Add more OMEMO exceptions 2022-02-23 15:29:53 -05:00