aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-12-18 20:40:46 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-12-18 20:40:46 +0100
commitd3fb01d8f762bc87fbbb352d75bfa634b74808d3 (patch)
treeff60df616b66fc9d40b967ed157f8c6a6a0fbf89 /tests/plupload/plupload_test.php
parentMerge pull request #4585 from VSEphpbb/ticket/14925 (diff)
parentMerge pull request #4586 from Crizz0/ticket/14770 (diff)
downloadphpbb-d3fb01d8f762bc87fbbb352d75bfa634b74808d3.tar.gz
phpbb-d3fb01d8f762bc87fbbb352d75bfa634b74808d3.tar.bz2
phpbb-d3fb01d8f762bc87fbbb352d75bfa634b74808d3.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'tests/plupload/plupload_test.php')
-rw-r--r--tests/plupload/plupload_test.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/plupload/plupload_test.php b/tests/plupload/plupload_test.php
index 3312f4d0a0..46bebb8d35 100644
--- a/tests/plupload/plupload_test.php
+++ b/tests/plupload/plupload_test.php
@@ -24,7 +24,7 @@ class phpbb_plupload_test extends phpbb_test_case
array(
130,
150,
- 'resize: {width: 130, height: 150, quality: 100},'
+ 'resize: {width: 130, height: 150, quality: 85},'
),
);
}