Joas Schilling 61fa9dcb9f Merge branch '3.1.x' ...

Conflicts:
	phpBB/styles/subsilver2/template/search_results.html

2015-02-20 20:42:52 +01:00

..

template

Merge branch '3.1.x'

2015-02-20 20:42:52 +01:00

theme

[ticket/13640] Rearrange css in a better order

2015-02-20 20:21:31 +01:00

style.cfg

[prep-release-3.1.3] Update version to 3.1.2-RC1

2015-01-26 19:42:06 +01:00