diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-02-25 14:26:59 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-02-25 14:26:59 +0100 |
| commit | 4c980a4851804c4f5379e364e106edacd04c42e4 (patch) | |
| tree | 0ad2d8efe8affc59cdeeb65edfec05e45a07c8db /apps/files/js/fileactions.js | |
| parent | 632ca9f06d2247061b7f03ce9bfcd0402bd92441 (diff) | |
| parent | a37577e007ef458e31d3484b5f969ea0e98545f3 (diff) | |
| download | nextcloud-server-4c980a4851804c4f5379e364e106edacd04c42e4.tar.gz nextcloud-server-4c980a4851804c4f5379e364e106edacd04c42e4.zip | |
Merge branch 'master' into update-expire-function
Conflicts:
apps/files_trashbin/appinfo/version
apps/files_trashbin/lib/trash.php
Diffstat (limited to 'apps/files/js/fileactions.js')
0 files changed, 0 insertions, 0 deletions