38f4ecaeac
* owncloud/master: (30 commits) Added entry with ext storage info [tx-robot] updated from transifex [tx-robot] updated from transifex clarifying license remove unused method tail() reliable detect encrypted files [tx-robot] updated from transifex remove duplicated code add missing quotes + field declarations Do not use xcache variable cache if cache size is 0. always show home breadcrumb in files view Use DEBUG instead of ERROR when favourites not found. Fix #6419 update file cache for target file only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted Fixed JS plural function to be per app call set password hook because it doesn't get triggered during test execution and fix paths Do not use L10n when logging exceptions Also add default to the \OCP\IConfig interface add default parameter for AllConfig->get*Value() always show 'Deleted Files' breadcrumb ... Conflicts: lib/private/memcache/xcache.php |
||
---|---|---|
.. | ||
apc.php | ||
apcu.php | ||
cache.php | ||
factory.php | ||
memcached.php | ||
xcache.php |