Andreas Fischer bc98118f92 Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/12146] Added a missing # to inline css-style of <span> Conflicts: phpBB/styles/prosilver/template/ucp_groups_manage.html		2014-02-02 17:20:07 +01:00
..
template	Merge branch 'develop-olympus' into develop	2014-02-02 17:20:07 +01:00
theme	[ticket/12125] Specify nth-child selectors separately - IE8 does not like them	2014-01-24 04:30:14 -08:00
style.cfg	[prep-release-3.1.0-a2] Update version to 3.1.0-a2	2013-11-19 01:18:21 +01:00