Marc Alexander 2e31cae7bf Merge branch 'ticket/13930' into ticket/13930-master ...

Conflicts:
	phpBB/includes/acp/acp_database.php

2015-06-08 15:39:47 +02:00

..

dummy.php

[ticket/13782] Rename null log to dummy for PHP7 compatibility

2015-05-04 10:11:28 +02:00

log_interface.php

…

log.php

Merge branch 'ticket/13930' into ticket/13930-master

2015-06-08 15:39:47 +02:00