[SPIP] ~maj v3.0.14-->v3.0.17

[ptitvelo/web/www.git] / www / plugins-dist / medias / base / typedoc.php

diff --git a/www/plugins-dist/medias/base/typedoc.php b/www/plugins-dist/medias/base/typedoc.php
index 089ec7a..e446b58 100644 (file)
--- a/www/plugins-dist/medias/base/typedoc.php
+++ b/www/plugins-dist/medias/base/typedoc.php
@@ -3,7 +3,7 @@
 /***************************************************************************\\r
  *  SPIP, Systeme de publication pour l'internet                           *\r
  *                                                                         *\r
- *  Copyright (c) 2001-2013                                                *\r
+ *  Copyright (c) 2001-2014                                                *\r
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *\r
  *                                                                         *\r
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *\r
@@ -115,6 +115,7 @@ $tables_documents = array(
                        'h' => 'C header',\r
                        'html' => 'HTML',\r
                        'jar' => 'Java Archive',\r
+                       'json' => 'JSON',\r
                        'kml' => 'Keyhole Markup Language',\r
                        'kmz' => 'Google Earth Placemark File',\r
                        'lyx' => 'Lyx file',\r
@@ -300,6 +301,7 @@ $tables_mime = array(
                'h'  => 'text/x-chdr',\r
                'html' => 'text/html',\r
                'jar' => 'application/java-archive',\r
+               'json' => 'application/json',\r
                'kml' => 'application/vnd.google-earth.kml+xml',\r
                'kmz' => 'application/vnd.google-earth.kmz',\r
                'lyx' => 'application/x-lyx',\r