Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/81279a1e Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/81279a1e Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/81279a1e Branch: refs/heads/master Commit: 81279a1e08df3ecd430e979f35460630cdc1bc4f Parents: 7ae760e 52ea9ba Author: tballison <[email protected]> Authored: Fri Jun 24 09:58:27 2016 -0400 Committer: tballison <[email protected]> Committed: Fri Jun 24 09:58:27 2016 -0400 ---------------------------------------------------------------------- .../org/apache/tika/mime/tika-mimetypes.xml | 3 ++- .../java/org/apache/tika/mime/TestMimeTypes.java | 5 +++++ .../resources/test-documents/testEXCEL_poi.xlsx | Bin 0 -> 3360 bytes 3 files changed, 7 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
