Igor Wiedler 0cad4ed49f Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10110] Remove multi-server syntax from Redis ACM.

Conflicts:
	phpBB/includes/cache/driver/redis.php

2011-06-11 12:06:29 +02:00

..

driver

Merge branch 'develop-olympus' into develop

2011-06-11 12:06:29 +02:00

factory.php

[task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.

2011-01-09 23:49:44 +01:00

service.php

[feature/attachment-management-no-reassignment] Handle privacy and some more.

2011-04-24 23:33:51 +08:00