summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2019-10-07 12:20:56 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-07 12:20:56 -0700
commit02cb49b00aa489ff714786ca2c67b72b24298510 (patch)
tree97972cd0805104ed8e5a9db9c3c8ccc930bbcce2
parente93009323d708c1b0cc869d6dc8b4a7eaaf8f15e (diff)
parented098f83868d70d8a8d64fcc77cc5b253e32eb74 (diff)
downloadmime-support-02cb49b00aa489ff714786ca2c67b72b24298510.tar.gz
Merge "mime.types: Update to debian/3.63, which is the latest named version." am: 21e648108d am: bc1aa6cf05
am: ed098f8386 Change-Id: I252e744376406d399c4f19cb04bf079dae8f997d
-rw-r--r--METADATA6
-rw-r--r--mime.types4
2 files changed, 6 insertions, 4 deletions
diff --git a/METADATA b/METADATA
index 43a8639..925780a 100644
--- a/METADATA
+++ b/METADATA
@@ -9,9 +9,9 @@ third_party {
}
url {
type: GIT
- value: "https://salsa.debian.org/debian/mime-support/blob/debian/3.61/mime.types"
+ value: "https://salsa.debian.org/debian/mime-support/blob/debian/3.63/mime.types"
}
- version: "Debian/3.61"
- last_upgrade_date { year: 2018 month: 8 day: 20 }
+ version: "Debian/3.63"
+ last_upgrade_date { year: 2019 month: 10 day: 3 }
license_type: UNENCUMBERED
}
diff --git a/mime.types b/mime.types
index dfa7a42..8e26dee 100644
--- a/mime.types
+++ b/mime.types
@@ -72,8 +72,9 @@ application/isup
application/java-archive jar
application/java-serialized-object ser
application/java-vm class
-application/javascript js
+application/javascript js mjs
application/json json
+application/ld+json jsonld
application/m3g m3g
application/mac-binhex40 hqx
application/mac-compactpro cpt
@@ -130,6 +131,7 @@ application/smil+xml smi smil
application/timestamp-query
application/timestamp-reply
application/vemmi
+application/wasm wasm
application/whoispp-query
application/whoispp-response
application/wita