merge branch ?charactergroupsqueststations?

This commit is contained in:
oliver 2016-01-28 22:33:53 +01:00
commit ba97244b15
13 changed files with 700 additions and 59 deletions

View file

@ -104,6 +104,10 @@
'charactergroupsquest' => array(
'width' => 80,
'height' => 80
),
'charactergroupsqueststation' => array(
'width' => 100,
'height' => 100
)
);
@ -160,6 +164,38 @@
'mimetype' => 'image/png',
'size' => 10485760
)
),
'stationimages' => array(
array(
'mimetype' => 'image/jpeg',
'size' => 1048576
),
array(
'mimetype' => 'image/png',
'size' => 2097152
)
),
'stationavs' => array(
array(
'mimetype' => 'audio/mpeg',
'size' => 2097152
),
array(
'mimetype' => 'audio/ogg',
'size' => 2097152
),
array(
'mimetype' => 'audio/opus',
'size' => 2097152
),
array(
'mimetype' => 'video/mp4',
'size' => 2097152
),
array(
'mimetype' => 'video/webm',
'size' => 2097152
)
)
);