signal-cli/src/main/java/org/asamk/signal/json
2021-04-24 22:47:31 -04:00
..
JsonAttachment.java try to merge again 2021-04-24 22:23:52 -04:00
JsonCallMessage.java try to merge again 2021-04-24 22:23:52 -04:00
JsonContactAddress.java try to merge again 2021-04-24 22:23:52 -04:00
JsonContactAvatar.java try to merge again 2021-04-24 22:23:52 -04:00
JsonContactEmail.java try to merge again 2021-04-24 22:23:52 -04:00
JsonContactName.java try to merge again 2021-04-24 22:23:52 -04:00
JsonContactPhone.java try to merge again 2021-04-24 22:23:52 -04:00
JsonDataMessage.java fixed some bad merges but there's more... 2021-04-24 22:47:31 -04:00
JsonError.java try to merge again 2021-04-24 22:23:52 -04:00
JsonGroupInfo.java try to merge again 2021-04-24 22:23:52 -04:00
JsonMention.java try to merge again 2021-04-24 22:23:52 -04:00
JsonMessageEnvelope.java fix unmerged files 2021-04-24 22:37:59 -04:00
JsonQuote.java try to merge again 2021-04-24 22:23:52 -04:00
JsonQuotedAttachment.java try to merge again 2021-04-24 22:23:52 -04:00
JsonReaction.java try to merge again 2021-04-24 22:23:52 -04:00
JsonReceiptMessage.java try to merge again 2021-04-24 22:23:52 -04:00
JsonRemoteDelete.java try to merge again 2021-04-24 22:23:52 -04:00
JsonSharedContact.java try to merge again 2021-04-24 22:23:52 -04:00
JsonSticker.java try to merge again 2021-04-24 22:23:52 -04:00
JsonSyncDataMessage.java try to merge again 2021-04-24 22:23:52 -04:00
JsonSyncMessage.java try to merge again 2021-04-24 22:23:52 -04:00
JsonSyncReadMessage.java try to merge again 2021-04-24 22:23:52 -04:00
JsonTypingMessage.java try to merge again 2021-04-24 22:23:52 -04:00