Joas Schilling a11994d424 Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/posting_body.html		2015-04-06 14:45:20 +02:00
..
template	Merge branch '3.1.x'	2015-04-06 14:45:20 +02:00
theme	[ticket/13741] Remove outdated references to tweaks.css	2015-04-03 11:14:20 +03:00
style.cfg	[prep-release-3.1.3] Update version to 3.1.2-RC1	2015-01-26 19:42:06 +01:00