diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:55:53 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:55:53 +0100 |
| commit | 7b08a483fd364138a573bb5f403fb6176c2b5c04 (patch) | |
| tree | b3a5d9ea807d8944099de77f1584f74ff72008d4 /phpBB/includes/acp/acp_update.php | |
| parent | 287c2b95ee64540374a78b6e4777d93c474dd402 (diff) | |
| parent | 943e4e35eef80b9ebe689e6b1933a405575962c3 (diff) | |
| download | forums-7b08a483fd364138a573bb5f403fb6176c2b5c04.tar forums-7b08a483fd364138a573bb5f403fb6176c2b5c04.tar.gz forums-7b08a483fd364138a573bb5f403fb6176c2b5c04.tar.bz2 forums-7b08a483fd364138a573bb5f403fb6176c2b5c04.tar.xz forums-7b08a483fd364138a573bb5f403fb6176c2b5c04.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12202] Use an array in the data provider instead of exploding manually
[ticket/12202] Can't call htmlspecialchars before checking for quotes
[ticket/12202] Fix tests
[ticket/12202] Test for parse_cfg_file
[ticket/12202] Use copyright symbol in style.cfg files
[ticket/12202] Apply htmlspecialchars to style.cfg data
Conflicts:
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'phpBB/includes/acp/acp_update.php')
0 files changed, 0 insertions, 0 deletions