Marc Alexander 53f186d96b Merge branch 'prep-release-3.2.1' into 3.2.x		2017-07-16 20:53:18 +02:00
..
acp	Merge pull request #4794 from lr94/ticket/15176	2017-06-24 21:42:39 +02:00
diff
hooks
mcp	Merge branch '3.1.x' into 3.2.x	2017-06-25 11:06:47 +02:00
questionnaire
ucp	Merge branch 'prep-release-3.1.11' into prep-release-3.2.1	2017-07-16 18:24:47 +02:00
utf
.htaccess
bbcode.php
compatibility_globals.php
constants.php	[prep-release-3.2.1] Update versions for 3.2.1	2017-07-16 17:10:46 +02:00
functions.php	Merge pull request #35 from phpbb/ticket/security-203-rhea	2017-07-16 15:29:35 +02:00
functions_acp.php
functions_admin.php
functions_compatibility.php
functions_compress.php
functions_content.php	Merge branch '3.1.x' into 3.2.x	2017-05-25 08:52:45 +02:00
functions_convert.php
functions_database_helper.php
functions_display.php	[ticket/15176] Add setting for user activity display limit.	2017-04-16 16:28:38 +02:00
functions_download.php
functions_jabber.php	Merge branch '3.1.x' into 3.2.x	2017-06-05 11:02:30 +02:00
functions_mcp.php
functions_messenger.php	Merge branch '3.1.x' into 3.2.x	2017-06-05 11:13:39 +02:00
functions_module.php
functions_posting.php	Merge branch '3.1.x' into 3.2.x	2017-06-25 21:26:43 +02:00
functions_privmsgs.php
functions_transfer.php
functions_user.php	Merge branch '3.1.x' into 3.2.x	2017-02-22 11:09:02 +01:00
index.htm
message_parser.php
sphinxapi.php
startup.php	[ticket/15227] Remove function deregister_globals, not needed	2017-05-21 16:57:01 +02:00