tree 6928408bdcd6fd779a181b0bb78b3b2e6db19b54
parent ffaeaf33fdab26c0345a010e74d9843dc1e02031
parent 0c7e54e6fc75d4dc6d25368a606dd1747697cf2e
author Matthias Sohn <matthias.sohn@sap.com> 1603705092 +0100
committer Matthias Sohn <matthias.sohn@sap.com> 1603705092 +0100

Merge branch 'stable-2.16' into stable-3.0

* origin/stable-2.16:
  Replace tika by overviewproject mime-types to detect mime types
  Avoid any uses or lookups of ffmpeg by Tika

Change-Id: Ib68517a6df1ff0778f7637083155f8a5d491611e