1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-23 00:32:57 +02:00

Merge branch 'ticket/10729' into ticket/10729-asc

Conflicts:
	phpBB/includes/functions_user.php
This commit is contained in:
Joas Schilling
2014-09-23 09:17:38 +02:00
4 changed files with 982 additions and 4 deletions

View File

@@ -30,4 +30,11 @@
<column>session_ip</column>
<column>session_browser</column>
</table>
<table name="phpbb_banlist">
<column>ban_id</column>
<column>ban_userid</column>
<column>ban_email</column>
<column>ban_reason</column>
<column>ban_give_reason</column>
</table>
</dataset>