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/styles/prosilver/style.cfg | |
| parent | Merge pull request #2126 from nickvergessen/ticket/forumhulp/12241 (diff) | |
| parent | Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympus (diff) | |
| download | phpbb-7b08a483fd364138a573bb5f403fb6176c2b5c04.tar.gz phpbb-7b08a483fd364138a573bb5f403fb6176c2b5c04.tar.bz2 phpbb-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/styles/prosilver/style.cfg')
| -rw-r--r-- | phpBB/styles/prosilver/style.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 50755cdbe5..f4f67635dd 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -17,7 +17,7 @@ # General Information about this style name = prosilver -copyright = © phpBB Group, 2007 +copyright = © phpBB Group, 2007 style_version = 3.1.0-a3 phpbb_version = 3.1.0-a3 |