diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 21:50:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 21:50:50 +0200 |
| commit | 95ebe2dcbf9ab8d1264e0cdc1df7368051cacdf4 (patch) | |
| tree | 0b202440abf07f5b7e84bdea81c605ec15758889 /phpBB/includes/bbcode.php | |
| parent | b2742243c7006f6b201803e20c18d741362a5689 (diff) | |
| parent | 47b240660b688fab7a3dc57c46392506f1350daa (diff) | |
| download | forums-95ebe2dcbf9ab8d1264e0cdc1df7368051cacdf4.tar forums-95ebe2dcbf9ab8d1264e0cdc1df7368051cacdf4.tar.gz forums-95ebe2dcbf9ab8d1264e0cdc1df7368051cacdf4.tar.bz2 forums-95ebe2dcbf9ab8d1264e0cdc1df7368051cacdf4.tar.xz forums-95ebe2dcbf9ab8d1264e0cdc1df7368051cacdf4.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12582] Use the correct script name.
[ticket/12582] Fix coding style.
[ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
[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.
Diffstat (limited to 'phpBB/includes/bbcode.php')
0 files changed, 0 insertions, 0 deletions