Marc Alexander ca1ac36c20 Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/overall_header.html		2015-04-03 16:50:20 +02:00
..
template	Merge branch '3.1.x'	2015-04-03 16:50:20 +02:00
theme	Merge pull request #3428 from prototech/ticket/13463	2015-03-11 13:49:42 +01:00
style.cfg	[prep-release-3.1.3] Update version to 3.1.2-RC1	2015-01-26 19:42:06 +01:00