Marc Alexander 019e85d064 Merge branch '3.1.x' into 3.2.x ... Conflicts: phpBB/styles/subsilver2/template/mcp_move.html		2016-07-16 21:25:17 +02:00
..
template	Merge branch '3.1.x' into 3.2.x	2016-07-16 21:25:17 +02:00
theme	[ticket/14447] Remove trailing white spaces in Prosilver	2016-02-02 08:42:53 -08:00
style.cfg	[prep-release-3.2.0-RC1] Update version to 3.2.0-RC1	2016-06-19 17:51:51 +02:00