]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into scrutinizer_documentation_patches
authorThomas Müller <thomas.mueller@tmit.eu>
Fri, 14 Feb 2014 22:03:27 +0000 (23:03 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Fri, 14 Feb 2014 22:03:27 +0000 (23:03 +0100)
commit9fac95c2ab46a734607657bbad6f164aaa61286f
treefc035f83bc812fd4b2f36427bb130ddabf71433e
parentb330d07b51a983dc563a91244a3c83e691c9e97d
parentdf282d9ef8e040833574fac5c5fd3cbbae1b3209
Merge branch 'master' into scrutinizer_documentation_patches

Conflicts:
lib/private/appconfig.php
24 files changed:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/tests/util.php
apps/files_external/lib/config.php
apps/files_sharing/lib/cache.php
apps/files_trashbin/lib/trashbin.php
apps/user_ldap/lib/access.php
apps/user_ldap/lib/ildapwrapper.php
apps/user_ldap/lib/ldap.php
apps/user_ldap/lib/wizard.php
apps/user_ldap/user_ldap.php
lib/private/appconfig.php
lib/private/db/statementwrapper.php
lib/private/files.php
lib/private/files/cache/storage.php
lib/private/files/storage/common.php
lib/private/files/storage/local.php
lib/private/files/view.php
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/response.php
lib/private/user.php
lib/public/files/storage.php
lib/public/share.php