Tristan Darricau cd348b200a Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/11483] Add tests for generating user act key on force reactivate [ticket/11483] Generate user act key if database entry is empty		2016-11-06 15:41:59 +01:00
..
acp	Merge branch '3.1.x' into 3.2.x	2016-11-06 15:41:59 +01:00
diff	[ticket/13454] Add excessively removed code back	2016-01-06 13:52:11 +01:00
hooks	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
mcp	Merge branch '3.1.x' into 3.2.x	2016-10-01 16:58:07 +01:00
questionnaire	[ticket/14692] Remove duplicate subexpression in questionnaire.php	2016-07-02 10:35:27 +02:00
ucp	Merge branch '3.1.x' into 3.2.x	2016-09-17 16:27:25 +02:00
utf	[ticket/13454] Remove unused variables	2016-01-06 13:52:11 +01:00
.htaccess
bbcode.php	[ticket/13616] Updates direct call to twig environment constructor	2016-04-03 16:23:16 +02:00
compatibility_globals.php	[ticket/14636] Inject into set_config methods	2016-08-21 13:14:54 +02:00
constants.php	[prep-release-3.1.10] Update version numbers for 3.1.10	2016-10-02 21:06:56 +01:00
functions.php	Merge branch '3.1.x' into 3.2.x	2016-10-24 23:08:09 +02:00
functions_acp.php	Merge pull request #4021 from marc1706/ticket/14272	2016-03-27 13:34:17 +02:00
functions_admin.php	Merge pull request #4265 from Senky/ticket/10809	2016-09-25 17:19:13 +02:00
functions_compatibility.php	Merge branch '3.1.x'	2015-06-16 12:35:51 +02:00
functions_compress.php	[ticket/13454] Remove unused variables	2016-01-06 13:51:19 +01:00
functions_content.php	Merge branch '3.1.x' into 3.2.x	2016-09-17 12:59:56 +02:00
functions_convert.php	[ticket/10809] Remove MSSQL support	2016-08-02 12:06:06 +02:00
functions_database_helper.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
functions_display.php	[ticket/9435] Add NUM_PREDEFINED_BBCODES constant	2016-03-18 11:02:02 +01:00
functions_download.php	Merge pull request #4440 from danchr/ticket/14774	2016-09-11 13:59:06 +02:00
functions_jabber.php	[ticket/12487] Update PHP code	2015-01-11 13:22:59 +01:00
functions_mcp.php	[ticket/14325] Preserve event variable BC	2015-11-30 18:05:46 +01:00
functions_messenger.php	Merge branch '3.1.x' into 3.2.x	2016-09-24 10:28:39 +02:00
functions_module.php	[ticket/13454] Remove unused variables	2016-01-06 13:52:11 +01:00
functions_posting.php	Merge branch '3.1.x' into 3.2.x	2016-07-07 19:19:40 +02:00
functions_privmsgs.php	[ticket/10961] Send HTTP 403 when applicable	2016-09-01 08:48:37 +02:00
functions_transfer.php	[ticket/13454] Remove unused variables	2016-01-06 13:52:11 +01:00
functions_user.php	Merge branch '3.1.x' into 3.2.x	2016-09-18 13:08:35 +02:00
index.htm
message_parser.php	Merge branch '3.1.x' into 3.2.x	2016-10-03 20:20:54 +02:00
sphinxapi.php	[ticket/13454] Remove unused variables	2016-01-06 13:52:11 +01:00
startup.php	Merge branch '3.1.x'	2015-06-09 21:27:56 +02:00