Nils Adermann 6bfadd86ed Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/12789] Move duplicated functions to the base class
  [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()

Conflicts:
	phpBB/phpbb/cache/driver/file.php
	phpBB/phpbb/cache/driver/memory.php

2014-08-08 15:06:46 +02:00

..

driver

Merge branch 'develop-ascraeus' into develop

2014-08-08 15:06:46 +02:00

service.php

Merge pull request #2720 from PayBas/ticket/12838

2014-08-07 16:13:35 +02:00