aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-05-27 20:53:22 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-05-27 20:53:22 +0200
commit709e363349e460879807f6d524ce33c710904175 (patch)
treebd2de992ee3d8e3d929d6bbe87cda873658fba08 /phpBB/develop
parenta1e31f4389961bc32e9e9dfaa3f0ac21331f10aa (diff)
parentd7c143da24083d5b1fbf3ffa36846a3a071a02be (diff)
downloadforums-709e363349e460879807f6d524ce33c710904175.tar
forums-709e363349e460879807f6d524ce33c710904175.tar.gz
forums-709e363349e460879807f6d524ce33c710904175.tar.bz2
forums-709e363349e460879807f6d524ce33c710904175.tar.xz
forums-709e363349e460879807f6d524ce33c710904175.zip
Merge branch 'ticket/12582' into ticket/12582-ascraeus
* ticket/12582: [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
Diffstat (limited to 'phpBB/develop')
-rwxr-xr-xphpBB/develop/strip_icc_profiles.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/develop/strip_icc_profiles.sh b/phpBB/develop/strip_icc_profiles.sh
index 69431fbac2..d228448abe 100755
--- a/phpBB/develop/strip_icc_profiles.sh
+++ b/phpBB/develop/strip_icc_profiles.sh
@@ -3,7 +3,6 @@
# @copyright (c) 2014 phpBB Group
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
#
-set -e
if [ "$#" -ne 1 ]; then
SCRIPT=$(basename "$0")