Thomas Müller 9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/appconfig.php		2014-02-14 23:03:27 +01:00
..
apc.php	Merge pull request #6647 from owncloud/memcache-public	2014-02-04 05:38:53 -08:00
apcu.php	Use APCIterator for Memcache\APC::clear()	2014-01-06 12:58:43 +01:00
cache.php	Remove the static dependency on OC_Util from Memcache	2014-01-06 13:11:38 +01:00
factory.php	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
memcached.php	Readd support for memcached_server config variable.	2014-01-10 00:57:40 +01:00
xcache.php	Merge remote-tracking branch 'owncloud/master' into fixing-3417-master	2013-12-18 15:44:46 +01:00