diff options
| author | Daniel Erat <derat@google.com> | 2016-01-04 14:45:16 -0700 |
|---|---|---|
| committer | Daniel Erat <derat@google.com> | 2016-01-04 14:45:16 -0700 |
| commit | f47b11cc8e8e27f27d1772c18f09135a948dd59f (patch) | |
| tree | a3c1d564cc73d9f6e92f8ef4506d039816a56575 /core/src/test/resources/META-INF/nanohttpd/mimetypes.properties | |
| parent | 12973d7c220d261c3748e3c8051b3ef478cf5b7a (diff) | |
| parent | a90fe20374f74dcddbd4b4cddd13e2c23c64e55b (diff) | |
| download | nanohttpd-f47b11cc8e8e27f27d1772c18f09135a948dd59f.tar.gz | |
Integrate upstream changes to 2.2.0.android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
Merge tag 'nanohttpd-project-2.2.0' from
https://github.com/NanoHttpd/nanohttpd to add HTTPS support.
Bug: 26289868
Change-Id: I6ea26be836ec2682c766127f2fa41f4932557718
Diffstat (limited to 'core/src/test/resources/META-INF/nanohttpd/mimetypes.properties')
| -rw-r--r-- | core/src/test/resources/META-INF/nanohttpd/mimetypes.properties | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/src/test/resources/META-INF/nanohttpd/mimetypes.properties b/core/src/test/resources/META-INF/nanohttpd/mimetypes.properties new file mode 100644 index 0000000..2f353d8 --- /dev/null +++ b/core/src/test/resources/META-INF/nanohttpd/mimetypes.properties @@ -0,0 +1,3 @@ +#test mime types for nanohttpd +blabla=text/blabla +ts=video/wrongOverwrite
\ No newline at end of file |