Merge pull request #10377 from owncloud/git-fixes

fixes from git push force
remotes/origin/fix-10825
Morris Jobke 12 years ago
commit b4fd5fb275
  1. 2
      apps/files_encryption/tests/util.php

@ -472,8 +472,6 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
}
/**
/**
* @dataProvider dataProviderFortestIsMountPointApplicableToUser
*/

Loading…
Cancel
Save