Marc Alexander 1316fe2084 Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/memberlist_group.html		2015-11-26 14:45:36 +01:00
..
template	Merge branch '3.1.x'	2015-11-26 14:45:36 +01:00
theme	Merge pull request #4034 from hanakin/ticket/14295	2015-11-25 20:33:21 +01:00
style.cfg	[prep-release-3.2.0-a1] Update version to 3.2.0-a1	2015-11-09 20:20:26 +01:00