Andreas Fischer 9b500538e3 Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/12118] Add noindex meta tag to subsilver2 view-print templates Conflicts: phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html		2014-01-26 20:51:55 +01:00
..
template	Merge branch 'develop-olympus' into develop	2014-01-26 20:51:55 +01:00
theme	[ticket/11472] Expand palette cell links to the full block size.	2013-11-12 18:15:16 -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