]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into scrutinizer_documentation_patches
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 18 Feb 2014 17:31:33 +0000 (18:31 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 18 Feb 2014 17:31:33 +0000 (18:31 +0100)
commitc6f4f85e27a10459422ab9789c894d13f0cd34c7
tree6b4cf7a304242c5891952b428b3bca950924f309
parent9fac95c2ab46a734607657bbad6f164aaa61286f
parent8991e4505adba2dae8afe7b7941ec744bfe78712
Merge branch 'master' into scrutinizer_documentation_patches

Conflicts:
lib/private/migration/content.php
18 files changed:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/util.php
apps/files_external/lib/google.php
apps/files_trashbin/lib/trashbin.php
apps/files_versions/lib/versions.php
lib/private/backgroundjob/joblist.php
lib/private/cache/fileglobal.php
lib/private/db.php
lib/private/db/statementwrapper.php
lib/private/migrate.php
lib/private/migration/content.php
lib/private/util.php
lib/public/backgroundjob.php
lib/public/config.php
lib/public/iconfig.php