diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-27 20:38:20 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-27 20:38:20 +0200 |
| commit | a1e31f4389961bc32e9e9dfaa3f0ac21331f10aa (patch) | |
| tree | d80239083ccf4556d2040ae1d9fc879411d297d4 /phpBB/phpbb/db/driver/postgres.php | |
| parent | 0acaa7722956635b8f17e19cddc6f02a602b7352 (diff) | |
| parent | b485318ba9e9831c87e7c33decf80bf74f350125 (diff) | |
| download | forums-a1e31f4389961bc32e9e9dfaa3f0ac21331f10aa.tar forums-a1e31f4389961bc32e9e9dfaa3f0ac21331f10aa.tar.gz forums-a1e31f4389961bc32e9e9dfaa3f0ac21331f10aa.tar.bz2 forums-a1e31f4389961bc32e9e9dfaa3f0ac21331f10aa.tar.xz forums-a1e31f4389961bc32e9e9dfaa3f0ac21331f10aa.zip | |
Merge branch 'ticket/12582' into ticket/12582-ascraeus
* ticket/12582:
[ticket/12582] Strip away copyrighted ICC profile
[ticket/12582] Change strip_icc_profiles.sh to only take a single file.
[ticket/12582] Run strip_icc_profiles.sh on Travis CI.
[ticket/12582] Overwrite inplace instead of creating _original files.
[ticket/12582] Add script for strippping ICC profiles from images.
Conflicts:
.travis.yml
Diffstat (limited to 'phpBB/phpbb/db/driver/postgres.php')
0 files changed, 0 insertions, 0 deletions