Joas Schilling e5595ca216 Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/forumlist_body.html		2015-02-26 22:53:26 +01:00
..
template	Merge branch '3.1.x'	2015-02-26 22:53:26 +01:00
theme	Merge pull request #3425 from dragosvr92/patch-4	2015-02-20 20:55:23 +01:00
style.cfg	[prep-release-3.1.3] Update version to 3.1.2-RC1	2015-01-26 19:42:06 +01:00