diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-31 12:58:12 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-31 12:58:12 +0200 |
| commit | 1bfe975938e96f462afe5ef5e5ebc75735767711 (patch) | |
| tree | 041bb3fe5f9cbd8ccff3fcacd2d629287b7d0410 /apps/files_encryption/tests | |
| parent | 96ef926161155cf710838612501bf76756f89cb4 (diff) | |
| parent | d636e168a6c043ddae730f7cdaaee772b1067793 (diff) | |
| download | nextcloud-server-1bfe975938e96f462afe5ef5e5ebc75735767711.tar.gz nextcloud-server-1bfe975938e96f462afe5ef5e5ebc75735767711.zip | |
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/lib/util.php
Diffstat (limited to 'apps/files_encryption/tests')
| -rwxr-xr-x | apps/files_encryption/tests/webdav.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php index 0b3bed93e1f..1d406789f0c 100755 --- a/apps/files_encryption/tests/webdav.php +++ b/apps/files_encryption/tests/webdav.php @@ -216,7 +216,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { * * @param bool $body * - * @note this init procedure is copied from /apps/files/remote.php + * @note this init procedure is copied from /apps/files/appinfo/remote.php */ function handleWebdavRequest($body = false) { // Backends |