phpbb/phpBB/adm
Tristan Darricau b30c699900 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/index_body.html
	phpBB/styles/subsilver2/template/login_body.html
	phpBB/styles/subsilver2/template/login_forum.html
	phpBB/styles/subsilver2/template/ucp_login_link.html
	phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
	phpBB/styles/subsilver2/template/ucp_register.html
	phpBB/styles/subsilver2/template/viewforum_body.html
2015-06-06 11:44:05 +02:00
..
images [ticket/12648] Fix and modernize ACP header tabs 2014-06-24 00:02:24 +02:00
style [ticket/13200] Disable autocomplete for sensitive input fields 2015-06-04 19:01:46 +02:00
index.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00