Commit 4c7f5953 authored by Daniel Haag's avatar Daniel Haag
Browse files

Merge branch 'master' into uibk

parents fb3efea4 e53d4894
......@@ -57,7 +57,7 @@ define ('K_MAX_UPLOAD_SIZE', 25000000);
* List of allowed file types for upload (remove all extensions to disable upload).
* FOR SERVER SECURITY DO NOT ADD EXECUTABLE FILE TYPES HERE
*/
define ('K_ALLOWED_UPLOAD_EXTENSIONS', serialize(array('csv', 'tsv', 'xml', 'txt', 'png', 'gif', 'jpg', 'jpeg', 'svg', 'mp3', 'mid', 'oga', 'ogg', 'wav', 'wma', 'avi', 'flv', 'm2v', 'mpeg', 'mpeg4', 'mpg', 'mpg2', 'mpv', 'ogm', 'ogv', 'vid', 'pfx', 'pem', 'crt')));
define ('K_ALLOWED_UPLOAD_EXTENSIONS', serialize(array('csv', 'tsv', 'xml', 'txt', 'png', 'gif', 'jpg', 'jpeg', 'svg', 'mp3', 'mid', 'oga', 'ogg', 'wav', 'wma', 'avi', 'flv', 'm2v', 'mpeg', 'mpeg4', 'mpg', 'mpg2', 'mpv', 'ogm', 'ogv', 'vid', 'pfx', 'pem', 'crt','pdf')));
// -- DEFAULT META and BODY Tags --
......
......@@ -29236,7 +29236,7 @@ Statistiques des questions et des réponses peuvent non seulement être consult
<seg>user</seg>
</tuv>
<tuv xml:lang="DE">
<seg>Benutzerergebnisse</seg>
<seg>Benutzer</seg>
</tuv>
<tuv xml:lang="FR">
<seg>utilisateurs</seg>
......@@ -33279,7 +33279,7 @@ Statistiques des questions et des réponses peuvent non seulement être consult
<seg>laporan hasil test ke user</seg>
</tuv>
<tuv xml:lang="DE">
<seg>Gesamtbericht den Benutzer zeigen</seg>
<seg>Gesamtbericht den Benutzern zeigen</seg>
</tuv>
<tuv xml:lang="FR">
<seg>rapports pour les utilisateurs</seg>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment