infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix merge issue

pull/1/head
yflory 2020-06-24 11:45:34 +02:00
parent b4021bd2b0
commit db6c454837
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/src/less2/include/drive.less
View File

@ -4,7 +4,6 @@
@import (reference) "./limit-bar.less";
@import (reference) "./tokenfield.less";
@import (reference) "./dropdown.less";
@import (reference) "./buttons.less";
.drive_main() {
--LessLoader_require: LessLoader_currentFile();
@ -935,7 +934,6 @@
.cp-app-drive-button {
order: 15;
margin: 0 1em;
.buttons_main();
}
}

2
www/common/drive-ui.js
View File

@ -1334,7 +1334,7 @@ define([
break;
}
case 'trash': {
show = ['remove', 'restore', 'properties'];
show = ['remove', 'deleteowned', 'restore', 'properties'];
}
}