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 remote-tracking branch 'crizz0/ticket/8785' into develop	2014-03-13 11:28:21 +01:00
theme	[ticket/11111] Prosilver posting textarea may only be resized vertically	2014-03-13 12:47:28 -07:00
style.cfg	Merge branch 'develop-olympus' into develop	2014-03-14 13:55:53 +01:00