X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fweb%2Fwww.git;a=blobdiff_plain;f=www%2Fplugins-dist%2Fmedias%2Fbase%2Ftypedoc.php;fp=www%2Fplugins-dist%2Fmedias%2Fbase%2Ftypedoc.php;h=5882430564a003cbe3cef6b2c1900185aff16a1b;hp=089ec7a801203082c4b2f750ebddaa28cab9df78;hb=ac3048660a3889c33f121bf5a567654e674e543a;hpb=db106e5fbbef82fe8d4a95b1124113c2149ee37d

diff --git a/www/plugins-dist/medias/base/typedoc.php b/www/plugins-dist/medias/base/typedoc.php
index 089ec7a8..58824305 100644
--- a/www/plugins-dist/medias/base/typedoc.php
+++ b/www/plugins-dist/medias/base/typedoc.php
@@ -3,7 +3,7 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2013                                                *
+ *  Copyright (c) 2001-2014                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -300,6 +300,7 @@ $tables_mime = array(
 		'h'  => 'text/x-chdr',
 		'html' => 'text/html',
 		'jar' => 'application/java-archive',
+		'json' => 'application/json',
 		'kml' => 'application/vnd.google-earth.kml+xml',
 		'kmz' => 'application/vnd.google-earth.kmz',
 		'lyx' => 'application/x-lyx',