phpbb/phpBB/styles/subsilver2
Joas Schilling 7b08a483fd 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
2014-03-14 13:55:53 +01:00
..
template Merge pull request #2092 from nickvergessen/ticket/12090 2014-03-10 20:50:08 -05:00
theme [ticket/12236] Move AOL Instant Messanger field to custom profile field 2014-03-05 22:13:22 +01:00
style.cfg Merge branch 'develop-olympus' into develop 2014-03-14 13:55:53 +01:00