mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-14 10:20:54 +02:00
Code Issues Releases Wiki Activity
Files
b30c699900a88a5f4d1e346b64482c3acd23e001
php-phpbb/phpBB/adm
History
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
…
style
…
index.php
…