Marc Alexander a460aec68c Merge branch '3.1.x' into 3.2.x ... Conflicts: phpBB/language/en/install.php		2016-06-19 18:25: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' into 3.2.x	2016-06-19 18:25:16 +02:00
index.php	[ticket/13455] Update calls to request_var()	2015-02-03 20:50:40 +01:00