Wireshark-commits: [Wireshark-commits] master 3c3e889: json: add application/merge-patch+json to th

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 04 Nov 2019 14:05:25 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3c3e88986f81f672b11cf9a458f76e72f42627cd
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

3c3e889 by Joakim Karlsson (oakimk@xxxxxxxxx):

    json: add application/merge-patch+json to the media types handled.
    
    Change-Id: I09db950c4da59aa24da50715194be59f385b7032
    Reviewed-on: https://code.wireshark.org/review/34952
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  5acf14d   macOS: Remove an exit code check.
     add  3c3e889   json: add application/merge-patch+json to the media types handled.


Summary of changes:
 epan/dissectors/packet-json.c | 1 +
 1 file changed, 1 insertion(+)