Marc Alexander d3ca327f2c Merge branch '3.1.x' ...

Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html

2016-01-07 16:28:44 +01:00

..

template

Merge branch '3.1.x'

2016-01-07 16:28:44 +01:00

theme

[ticket/14371] Small fix for the quick links alignment

2015-12-24 14:00:34 +01:00

style.cfg

[prep-release-3.2.0-a2] Update version to 3.2.0-a2

2015-12-19 17:17:01 +01:00