Marc Alexander 8bfbd77828 Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/acp/acp_profile.php

2015-07-22 10:38:35 +02:00

..

images

[ticket/12648] Fix and modernize ACP header tabs

2014-06-24 00:02:24 +02:00

style

Merge branch '3.1.x'

2015-07-22 10:38:35 +02:00

index.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00