diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2012-07-03 18:17:32 +0100 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2012-07-03 18:17:32 +0100 |
| commit | b1c9785eb3fec9bc12dab8e4984b0b45880e7fa6 (patch) | |
| tree | 5467788a76be25b2a26ed5a75d2e1058573737d6 /apps/files_versions/ajax | |
| parent | a775deaf22ee803ae2ff0dbe1068229d9c819232 (diff) | |
| parent | aec6eea235526644be4e0642dd59a3b5f8e9c0e3 (diff) | |
| download | nextcloud-server-b1c9785eb3fec9bc12dab8e4984b0b45880e7fa6.tar.gz nextcloud-server-b1c9785eb3fec9bc12dab8e4984b0b45880e7fa6.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
Conflicts:
apps/files_versions/lib/versions.php
Diffstat (limited to 'apps/files_versions/ajax')
| -rw-r--r-- | apps/files_versions/ajax/rollbackVersion.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php index 127592f3b58..8d1092f8b8e 100644 --- a/apps/files_versions/ajax/rollbackVersion.php +++ b/apps/files_versions/ajax/rollbackVersion.php @@ -2,8 +2,6 @@ OCP\JSON::checkAppEnabled('files_versions'); -require_once('apps/files_versions/versions.php'); - $userDirectory = "/".OCP\USER::getUser()."/files"; $file = $_GET['file']; |