Marc Alexander 2653b98e09 Merge branch 'ticket/14577' into ticket/14577-3.2.x ... Conflicts: phpBB/includes/acp/acp_modules.php		2016-04-02 09:51:37 +02:00
..
controller	[ticket/14462] Not show timeout messages in convertors	2016-02-14 19:27:24 +01:00
convert.php	[ticket/14262] Add error handling and small CS fixes	2016-02-02 16:09:40 +01:00
convertor.php	Merge branch 'ticket/14577' into ticket/14577-3.2.x	2016-04-02 09:51:37 +02:00