This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
commit 201adcc35305b443b7f11775319c50b37930a396 Merge: 38e393e af7adbe Author: tallison <[email protected]> AuthorDate: Tue Jun 16 13:43:43 2020 -0400 Merge remote-tracking branch 'origin/branch_1x' into branch_1x .../resources/org/apache/tika/mime/tika-mimetypes.xml | 1 + .../test/java/org/apache/tika/mime/TestMimeTypes.java | 1 + .../src/test/resources/test-documents/testWMV_WMV2.wmv | Bin 0 -> 554297 bytes 3 files changed, 2 insertions(+)
