Marc Alexander dce1c5d4c9 Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/theme/stylesheet.css		2015-08-17 09:39:16 +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-08-17 09:39:16 +02:00
index.php	[ticket/13455] Update calls to request_var()	2015-02-03 20:50:40 +01:00