Marc Alexander 0028ed3e95 Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/ucp_prefs_personal.html		2016-01-08 16:39:33 +01:00
..
images	[ticket/12648] Fix and modernize ACP header tabs	2014-06-24 00:02:24 +02:00
style	Merge branch '3.1.x'	2016-01-08 16:39:33 +01:00
index.php	[ticket/13455] Update calls to request_var()	2015-02-03 20:50:40 +01:00